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

Change-Id: Ib15faa15306d01d472b568d58685c61bdc5e88c5