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

Change-Id: Ic97851e34bfb989aae8773f0475ae6a61d967950