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

* commit '93d0245bc9cebf68a677d59b2ada1f72f9ea2dd2':
  Fix PATH setup for arm64.