Revert Android.bp workaround. am: c3d97aa421

Change-Id: I6af4204401ecf54f5aafe86b30102c84349d3590