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