Merge "Convert Android.mk file to Android.bp"
am: 0081b3831b

Change-Id: Ie2cc292573f62b32d5b6f36d4af483afc405b1e1