Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp

* commit '1f52229453c3df8eaeda64133bd332b01589354f':
  The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).