Merge "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" into nyc-mr2-dev-plus-aosp