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