tree 8290176692b44f6dcbb943fc35affd93ebd295d0
parent 473bb82785b702f2a1cdce97b25b1fd04a913efa
author Jason Macnak <natsu@google.com> 1630435247 -0700
committer Jason Macnak <natsu@google.com> 1630437336 -0700

Work around some arrays being mistakenly enabled

... by cherry-picking aosp/1554722 and aosp/1621957
from aemu.

Bug: b/198321237
Test: boot
Change-Id: I4dcc468117f3dae2c1a7a5b2076f4e6b983524f6