Merge "Convert Android.mk files to Android.bp" am: 1ccb28f28a
am: aabc1be2ea

Change-Id: Ic2e36324d145bc7ff064647b8304f548235382aa