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

* commit '6cc89747ec0c5a553a99acd9be14eb9eaac1c89f':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH