Merge 4.9.140 into android-4.9

Changes in 4.9.140
	Revert "x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation"
	Revert "ipv6: set rt6i_protocol properly in the route when it is installed"
	Linux 4.9.140

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>