Merge "fix: boot fails on ASAN builds with VNDK restriction" into oc-mr1-dev