Merge "Add media.log to Watchdog stacks" into nyc-dev
am: c92315b91d

* commit 'c92315b91d536aba3bc50facbd75de8741eaa7c3':
  Add media.log to Watchdog stacks