am 6190a0c3: back port cc6be0a3: wrap make. do not merge
am 6190a0c3: back port cc6be0a3: wrap make. do not merge

* commit '6190a0c3b33ea43639a7e748182fbac62560a09d':
  back port cc6be0a3: wrap make. do not merge

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build