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

Change-Id: I0ffd89a0f5948f083d310a5b5269be9e4ac22ec1