Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb