Merge changes Iecc0c938,Ib687b661 into udc-qpr-dev

* changes:
  Format VTS test code
  aidl: Improve Effect VTS naming