Merge \"AudioTrackSurroundTest: Add delay when switching between compressed formats\" into nyc-dev
am: 5a70084eab

Change-Id: Id92a08e68d8a78aa8467b67d5f86a90987f66ac1