Android CTS 6.0 Release 4
Merge "Check for RFC 5746 TLS extension" into marshmallow-cts-dev