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

* commit '0d16928e60d9ed282bb8458a88d22e7fa7a0e485':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH