Merge "vndk-def: Reduce deps-insight startup time"