DO NOT MERGE Fix AudioEffect reply overflow am: 7ffa39c4 am: 0dac1009 am:...

DO NOT MERGE Fix AudioEffect reply overflow am: 7ffa39c4 am: 0dac1009 am: 02bdc831  -s ours am: 11018b82  -s ours am: 5f2bf6a7 am: 6456e25f am: 94338771  -s ours am: 443de3f2 am: 21c641d4 am: b04ee839 am: 083f301c  -s ours am: 9e328bc3 am: bec91884  -s ours
am: 06e8ac07  -s ours

* commit '06e8ac07':

Change-Id: Ib6f729f3812fe7b19e374e14f7a8caabcf8cc7c0