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