audiopolicy: engine: cleanup to enable VTS testing am: ab1837ab01 am: bb1eac65db

Change-Id: Ic19a1ca5dbeea2a31288db9c2d9a4a40318930c3