am 8b90ac3b: Cleanup Android.mk.

* commit '8b90ac3b73e48894c4b7547ee4a04deff0ccc595':
  Cleanup Android.mk.