Merge "Apply static RRO when parsing Android manifest of a target package" into oc-dev am: dc326a883e
am: 1a4bcd04ee

Change-Id: I342faf8a6486f3b6dfdf42047e90ae11671b58e5