Merge "Convert Android.mk file to Android.bp." am: a8080680d2 am: 0bce21a8c2
am: 7c086b6fe1

Change-Id: I92eb48592f7854d736d81cfe36548bb544a7da63