Merge commit '85ce45e2' into manualmerge Conflicts: libaudio-qsd8k/AudioHardware.cpp libaudio-qsd8k/AudioHardware.h Signed-off-by: Iliyan Malchev <malchev@google.com>