[automerger skipped] Merge "convert Android.mk to Android.bp" am: c669370651 am: b8f5bc6788
am: d16be706e4 -s ours
am skip reason: change_id Ifdecd437cdd73520060f80549fb1a22464f083a0 with SHA1 775842b2a8 is in history

Change-Id: I65b58ef88a7797c0b2510d1f6f8723801194dc1f