am 2743b909: am 8b90ac3b: Cleanup Android.mk.

* commit '2743b909488d24f0c57f688d5ee5a759c2a4cf1a':
  Cleanup Android.mk.