Android CTS 6.0 release 3
Merge "Remove OpenSSL include paths."