Merge cherrypicks of [19068989] into tm-release.

            tidToCycleCounterMap[currentThreadId]++;

            if (tidToCycleCounterMap[currentThreadId] >= mMaxCycles) {

                ALOGW("CameraServiceWatchdog triggering kill for pid: %d", getpid());

                kill(getpid(), SIGKILL);

                ALOGW("CameraServiceWatchdog triggering abort for pid: %d", getpid());

                // We use abort here so we can get a tombstone for better

                // debugging.

                abort();

            }

        }

    }