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

Change-Id: Ia0c038b03cc4f76ecc0157419f5ffed1aa3042ef