Merge "Upload platform compat config generated from framework target." am: d7345e92 am: 01a10679 am: f74bce37 am: 1d7d0288 Change-Id: I91d6e1989508aae4895ff5d6611a64e1450744f9