Merge "DO NOT MERGE Fix AudioEffect reply overflow" into lmp-dev am:...

Merge "DO NOT MERGE Fix AudioEffect reply overflow" into lmp-dev am: 540acb3d  -s ours am: afd076b2 am: 00cf665d am: 3b4e5700  -s ours am: ac2e1956 am: b50988e8 am: 0f8a045c am: 56ff3ab2  -s ours am: 8716aa52 am: cbe7d037
am: 65b8b3a1  -s ours

* commit '65b8b3a1':

Change-Id: I4226e028d57f211a7cd0e31f6fd58fba61a15060