Revert "staging: Remove logger and alarm-dev from android Makefile"