am 8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"
am 8e3a71f7: Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"

* commit '8e3a71f75e08b4ad580903f2edc7edea5dc07806':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH

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