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