Use actual VNDK list for non-VNDK-enforcing devices am: 8a9a8eeb85 am: c2ff3dbbfe
am: cd299eb528  -s ours

Change-Id: I49ac136860e08782262f624958c2e4bf2c08047b