Android CTS 7.1 Release 1
Merge "Remove OpenSSL include paths."