Merge "Code clean for audioflinger"