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

* commit '57b4d1c44e246dfd4aaef2d23b20a696a0c5e57e':
  Fix armv8 testing with default ANDROID_ROOT.