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