Use actual VNDK list for non-VNDK-enforcing devices
am: 8a9a8eeb85

Change-Id: I2677acd9dbd266873fb12d20674e298cc9d1444c