Merge "DO NOT MERGE Fix AudioEffect reply overflow" into mnc-dev am: e29e934c6e am: a95c6afecb am: a17042b108
am: ba5a77d72a  -s ours

* commit 'ba5a77d72a7670826c6d73eead4466fd49d50a0f':
  DO NOT MERGE Fix AudioEffect reply overflow

Change-Id: I0be3a33672acd4bad02072750d88b013a9c11705