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

Change-Id: Iefa70482ddc2dd00992806cd00dbd24cbc1898be