Revert "base: QCOM's revenge"

This reverts commit e1984f24208698a85e2390e7c3edacacb188107f.

I screwed up and merged this too early - it appears to be the cause of various audio hangs on find5.

Change-Id: I4f3195fc2f7d2aafd76cf115fdc0b47b05c4cfda
Merge "Revert "base: QCOM's revenge"" into android-4.4