Merge changes Ia1b282bd,I3c53a5d1

* changes:
  vndk-def: Code cleanup
  vndk-def: Remove unused command