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