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

Change-Id: I7803a75b0c0a863e5491b3faa3a03c03f46036e8