Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety" into nyc-dev am: 5ab2dba9d6  -s ours am: 1d2f93208d  -s ours am: 6483838270  -s ours am: 46c00e467d  -s ours am: 310cc83920  -s ours
am: b17539de45  -s ours

Change-Id: I82a15de93f46963734a69a55099c8746d802e2ac