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

* commit '51248395626ceb9f54016e78ebb4adee17b290c1':
  Clean up adb/Android.mk