Android 7.0.0 release 17
Merge "Remove OpenSSL include paths."