Merge "Update goldfish_kernel_tests_x86_64"
am: 53dc7bfa40

Change-Id: I58c3a882f1b251329e0b3272865ad7725ff0addc