Merge commit '6727fbd4be7d7cd0acfb55b7461f9d9a23225f60' into eclair-plus-aosp * commit '6727fbd4be7d7cd0acfb55b7461f9d9a23225f60': Additional corrections for AudioHardware: