am 043b3b05: am 57b4d1c4: Merge "Fix armv8 testing with default ANDROID_ROOT."

* commit '043b3b05bcdf365b3660b6a76e014bc61924d246':
  Fix armv8 testing with default ANDROID_ROOT.