Follow-up for 1.0.1j upgrade

During review the error with sizeof was found, but import_openssl.sh was
not re-run to fix the actual file from the updated patch. This applies
the fix and also fixes a subsequent patch that also had the error as
context lines.

Bug: 18018599
Change-Id: Ia852a3f703548dc6488863fb11fd6ce82b1bb06f
Merge "Follow-up for 1.0.1j upgrade"