Merge "Convert Android.mk to Android.bp" am: 7ee95c3a50
am: 56698ebc6a

Change-Id: I714ca11333390df86e5dcc6134d9acad345f1c18