Merge "Convert Android.mk file to Android.bp" am: 93068a3c58 am: 7a336bcdd6
am: cb228be070

Change-Id: I636d7aa8e106e9a880752fae8bb4dde50f218b3e