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

* commit 'e640ebe29247a8dd647016396bd9d698ace2fd28':