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

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