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