Android 6.0.1 release 10
Merge "Remove OpenSSL include paths."