Merge "Add thread id to error log for Camera Watchdog"

            tidToCycleCounterMap[currentThreadId]++;

            if (tidToCycleCounterMap[currentThreadId] >= mMaxCycles) {

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

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

                        currentThreadId);

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

                // debugging.

                abort();