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