Back out ecac2ce4eada (bug 828126) for busting b2g's arm

dom/base/nsDOMWindowUtils.cpp

@@ -2194,7 +2194,12 @@ nsDOMWindowUtils::StopFrameTimeRecording(float** paintTimes, uint32_t *frameCoun
     /* copy over the frame intervals and paint times into the arrays we just allocated */
     for (uint32_t i = 0; i < *frameCount; i++) {
       (*frameIntervals)[i] = tmpFrameIntervals[i];
+#ifndef ANDROID
       (*paintTimes)[i] = tmpPaintTimes[i];
+#else
+      // Waiting for bug 785597 to work on android.
+      (*paintTimes)[i] = 0;
+#endif
     }
   }
 

layout/base/nsRefreshDriver.cpp

@@ -942,10 +942,13 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
 #ifdef DEBUG_INVALIDATIONS
     printf("Starting ProcessPendingUpdates\n");
 #endif
+#ifndef ANDROID
+    // Waiting for bug 785597 to work on android.
     nsRefPtr<layers::LayerManager> mgr = mPresContext->GetPresShell()->GetLayerManager();
     if (mgr) {
       mgr->SetPaintStartTime(mMostRecentRefresh);
     }
+#endif
 
     mViewManagerFlushIsPending = false;
     nsRefPtr<nsViewManager> vm = mPresContext->GetPresShell()->GetViewManager();