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

Change-Id: I71fd3c40a51074684dde3442c090b1f5992627f3