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

Change-Id: I32dd4c3c11116acb164578b8de2ad66f36c46430