Merge "goldfish: add x86/x86_64/arm 4.9 ranchu kernels" am: b851893dcb
am: 76fa3de092

Change-Id: I85438765009a2eb00fc3075f14eaac98363696b8