Merge "Update goldfish_kernel_tests_x86_64"