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

Change-Id: Ie429d350afeee515ceaa012e2c20d5971b7a12da