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