Merge "Fix armv8 testing with default ANDROID_ROOT."