[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: 0081b3831b am: 57c754bc37
am: a9951e0a89 -s ours
am skip reason: change_id Idb03dd371284aec57ed356c6091965672b7b95f5 with SHA1 3a60018717 is in history

Change-Id: I1b2afaf9404fdac2707787eb01b0e60bb15ab806