Revert Android.bp workaround. am: c3d97aa421 am: 12413aa875 am: 7fed2aa21a am: 0e1fbbfc81

Change-Id: Ic55f814bbcb7bb43f5490fa56075b594c7c57339