Merge changes I25e81a77,I95b8c142

* changes:
  vndk-def: Remove stale test data
  vndk-def: Support versioned VNDK directory paths