Merge "vndk-def: Add --enumerate to deps-closure"