Merge "Merge multiple compat_config.xml's."
am: b4cc0206bb

Change-Id: Ib4da2a767b58ba9e9ac5519a04a21d8e8b94e6e3