external/boringssl: cherry-pick crash fix am: 9083ef933c
am: df7c2ebfda

Change-Id: Id05fd03176db2282aecdf58311d6224ff5f8d89d