This reverts commit 64b507b1cf. Additionally, stop using delays as that can cause audioserver to crash Change-Id: If77eef84d04039b79ea1390dc81f89e5f01f354f
64b507b1cf