Merge "Watch for SurfaceFlinger death" into jb-mr1-dev