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