Merge changes I36674e2a,I7b54582f,I499d39e3

* changes:
  vndk-def: Refactor update_dataset.py
  vndk-def: Add workaround for extra VNDK-SP-Private
  vndk-def: Rename Indirect to Private