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