Merge "Convert Android.mk file to Android.bp" am: f852f1e355
am: 35d7bfafa2

Change-Id: I3394f7db6531062d7db4b52cb6f6df74e6d5b97b