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

Change-Id: Ibaca4a422d209cd186eb0371bddbae08494e0927