Merge "update 3.18 goldfish kernels"