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