Merge changes Ia5d46ad8,I60cec00d into oc-dr1-dev

* changes:
  Audio VTS profiling: Push xsd on target for policy config validation
  Audio VTS profiling: Sort AndroidTest.xml push for esthetic