am 9ebc6c6b: am 51248395: Merge "Clean up adb/Android.mk"

* commit '9ebc6c6b6006a36499524bae3c282ec2cc1f41eb':
  Clean up adb/Android.mk