Merge "Read *.rc files from flattened APEX" am: b3093ff21a
am: 116f5933de

Change-Id: I2dd41188acff876be8864287eca95004f2b6edce