Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"

This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing
changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base