Merge UBSan vla-bounds-not-positive fix from upstream

Bug: 315418482
Test: Treehugger
Change-Id: Ibc86b4ee4db288df0be771f007946ae7d65c01a9