Merge "vndk-def: Add --enumerate to deps-closure" am: c5efdcc746
am: 52f4573ee6

Change-Id: Id0d3d5c0dd6f07c942d65d29b85651b31d4f8ef8