[automerger skipped] Merge "RRO for framework-res.apk is not force built against SystemSDK" am: 73b009e96c
am: d60f6cbea7  -s ours

Change-Id: Ic39c59e106dd81cd6903d4cd2acf5c86b252fc4a