Android 7.1.0 release 7
Merge "Remove OpenSSL include paths."