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: cb0e14f856  -s ours

Change-Id: I8ed4b189f8af391cbedd243650b28de76657f938