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