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