Merge "Update goldfish_kernel_tests_x86_64" am: 53dc7bfa40
am: 4ac271db59

Change-Id: Idfdb63ecf90f1b684ec8dc34b846f065bc1545d1