am "Revert "Android: Remove superfluous OpenSSL include paths.""

merged from goog/mirror-m-wireless-internal-release
2107060 Revert "Android: Remove superfluous OpenSSL include paths."