Merge "Remove configuration exported from Soong" am: b1e0c2c478 am: c70f550338
am: 9e7c127da2

Change-Id: I2edd8ea9b2ae982d755ec9e4dc63b40dbd5bc2bc