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