Merge "Remove --coverage in Android.bp" am: 8cd0125d2e
am: 6439f344ad

Change-Id: I8a5f2071751984ff0ce400968d49781b247a5977