Merge "Convert Android.mk file to Android.bp" am: 4c43f7c257 am: 2165b8570d
am: 9d320cab5c

Change-Id: I0844edd11d72090e72f4b5d60c518901e7e831d7