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

Change-Id: I84752978cc0e040cdd11a2112163a5977b26bddb