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