am 870678a9: am 2c37f3d3: Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread

Merge commit '870678a954e1e2a96caf76453c20de808253ffd1'

* commit '870678a954e1e2a96caf76453c20de808253ffd1':
  Better support for fake timestamps in RTP, H.263 video now also requests FIR.