Merge "Update x86/mips 3.4 kernel from 6dff53caa619cef08ef4cfae48d3f186b0568a0f"