am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"

* commit '1cda15d3234a502ba7332b56a7bbecca228731cf':
  Don't modify LOCAL_STRIP_MODULE

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