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

* commit '4493858dc810bfa1f97d4517d469a8890abe40d5':
  Simplify the calculation of LOCAL_UNSTRIPPED_PATH