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

Change-Id: I9a08e15b9cbeedd780f71ee9e289dfe19aff03dc