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

Change-Id: Ie50552bd02097ac8d162274e3c98a88750ec522b