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

Change-Id: Id852b52224b197ad2d0ff5791a25b1bff791d512