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

Change-Id: Ib96b240c5e5d3cbaf74b94f59eadb26ea059c88a