Merge "Convert Android.mk file to Android.bp" am: c7ec1a8961 am: 36a96976b1
am: 89ce4bd4e1

Change-Id: Id008e4f56683d874568ab7f86f27edfe2353ba62