Android 7.1.1 release 9
Merge "Remove OpenSSL include paths."