back port cc6be0a3: wrap make. do not merge
back port cc6be0a3: wrap make. do not merge

Bug: 16368823 | Lunch sets $out with extra text
Change-Id: I2a1d422865a073cd30e86f1e20b4d99a3747cc0b
xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build