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