Merge "Convert Android.mk to Android.bp" am: 4d418b1e08 am: 93c1f4248d am: df8fb9e81c
am: 9b506e3996

Change-Id: I48e3b3b7dfc9c09da8c118c23824670d95935a84