Merge "audioflinger: add watchdog on main mutex" into nyc-mr1-dev