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

Change-Id: Ib4516944eed20457df20a8c17bd6a457e948fba9