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