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

Change-Id: I29044eba5da1c72a5e8a14d97617a1d1db3b0adc