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

Change-Id: Icec331b529ac46ce5118089f7b660f7079598149