[automerger skipped] Merge "Convert ExtShared/Android.mk to Android.bp." am: 3cf9d0cddf am: b61517d265 -s ours
am:ceed6806b9-s ours am skip reason: change_id Id0433358aeb7bbca34e68a6043d6239224bdf52b with SHA1790f3f7199is in history Change-Id: I02242653714ecf15447d816771f2cdd9beab0410
This commit is contained in: