DO NOT MERGE ANYWHERE (nyc-dr1-dev) audioflinger: add watchdog on main mutex am: 82f5b811b2  -s ours
am: c296ea4abd  -s ours

Change-Id: Iac9a768947f9599e27b2e6a203bf1b0add1133aa