Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
am: c025ea892e

Change-Id: Ifb690a1ac7d9ff2605c88bd4503e06311ef0dd1c