Merge "fix: boot fails on ASAN builds with VNDK restriction" into oc-mr1-dev am: 80206d8f03
am: 299591e464

Change-Id: I5cd5dee1902fccfcfd6fe26d3c250deafd1f2ba1