Merge "Convert Android.mk file to Android.bp" am: a81d64e940
am: efa1d26538

Change-Id: I8e82717e35d5d569a2a91fb609726537733d1aba