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