Merge commit '1041e6c9dff8fd18ccde1d86e0e7302fe94982ed' * commit '1041e6c9dff8fd18ccde1d86e0e7302fe94982ed': Patch from HTC: changes in libaudio