Android CTS 7.1 Release 4 (3866195)
Merge "Remove OpenSSL include paths."