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