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

Change-Id: I83a99d33a0c8f3f1e788b58feb428ffd58a59703