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

Change-Id: I46511d89643cc9be44fceea69d3ad9c12a65fe00