Merge changes I15bd7c12,Ibc59c610,I8c827e2b

* changes:
  vndk-def: Fix vndk-core path assertion.
  vndk-def: Code cleanup: Remove redundant code.
  vndk-def: Fix typo in unit test name.