external/boringssl: cherry-pick crash fix am: 3ef76b39e2  -s ours
am: cbd1804fc9  -s ours

Change-Id: I7c198ad8794e0afbbb2bcb271c11920c66987b99