Merge commit '4f294558aa23bc155988838ef153dca731efe707' into gingerbread-plus-aosp * commit '4f294558aa23bc155988838ef153dca731efe707': Fix broken insert reverb auto tests.
Merge commit '4f294558aa23bc155988838ef153dca731efe707' into gingerbread-plus-aosp * commit '4f294558aa23bc155988838ef153dca731efe707': Fix broken insert reverb auto tests.