am 00dcfcc0: Merge "Clean up Android.mk."

* commit '00dcfcc029e0b15b6fa9a27c7d6e38f4d8246205':
  Clean up Android.mk.