Merge "vndk-def: Scan dependencies from dex files" am: 57c1f00642
am: 66e19c6aa0

Change-Id: I84c4e9e12e038fb4abf5481dd140c5de54693c97