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

Change-Id: I2d78476add5792361f6d1e786fac80a6c30f0be8