Merge "AudioFlinger::Thread ensure proper add / sub" into qt-dev am: 654438952d
am: 57970a23d9

Change-Id: I23b380a8aaf56fb278cf187fba659b92cb51c8eb