Android 6.0.0 release 11
Merge "Remove OpenSSL include paths."