am e8c18f4d: am 805b3ae3: Merge "Now back to 30fps, suspend updates if surface flinger didn\'t send us" into jb-mr1-dev

* commit 'e8c18f4db997fac70c789eeb7d45d79645e8a7e3':
  Now back to 30fps, suspend updates if surface flinger didn't send us