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