Merge "Convert Android.mk to Android.bp." am: b0b6ab038c
am: c68c18b32a

Change-Id: I4061689715a4f54846655080e52b70c3d2e0c0c9