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

Change-Id: I65e9b5340cd4ffb7dc7a4ffe417b76bcd1db9acf