am 0b120475: am 93d0245b: am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."

* commit '0b1204753ecb3e0177706ca6933ce08361b16aa8':
  Fix PATH setup for arm64.