[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: 1c2c11990c am: 1b1553fbe0
am: 37cc525081 -s ours
am skip reason: change_id I23d8d5a019155a0f3296f7ab75e9b44b7621f3c8 with SHA1 500db62bfa is in history

Change-Id: I58521b52afd7cc6a1f53d695f80773888afd6254