Merge "Upload platform compat config generated from framework target." am: d7345e923a
am: 01a10679ac

Change-Id: I58aa534788607d80d4150f9e85e53162d96eb7d9