Merge "vndk-def: Reduce deps-insight startup time" am: 13a3e2ba6a
am: 8ea9ef9d29

Change-Id: I5d0a1948c39257e30e8c7431cf9cfb11f3346371