Merge "Set PRIVATE_PREFIX when using $(transform-prebuilt-to-target)"
am: 04e4fd3071

Change-Id: Icf2f285ef47e80b31efb8f04bbde1d457fa5c048