Merge "update 3.18 goldfish kernels"
am: 75bd734da6

Change-Id: I7767cfb82910740361f64574c6f131e9008ecf32