Merge commit '5d89308f2e1252eff2743bf823bf558dbb0de2fa' into eclair-plus-aosp * commit '5d89308f2e1252eff2743bf823bf558dbb0de2fa': Add wakelock to audio HAL. Bug 2218158.