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

Change-Id: I24f4b076a5d79b0671d70e6e3659c44e0782a1ef