Merge "Convert ExtShared/Android.mk to Android.bp."
am: 3cf9d0cddf

Change-Id: I91f290aa6555226accf76ae1dd9e9a8c6ea02871