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

* commit '5646d2f6aa851ca79440d573e73fa51cf6afaf81':
  Fix PATH setup for arm64.