Merge "Remove STOPSHIP (disable debug flag) in WatchDog.java" into qt-dev
am: c1fb7dd218

Change-Id: I7685f50eced23924007ca5c7e7735ffeeb45222c