[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: 4b5b191b42 am: 1cdaea76a4
am: defe724c7d -s ours
am skip reason: change_id I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5 with SHA1 df848ac224 is in history

Change-Id: I3602771542d0338ed059d6b87005ff5d2da167b2