merge in nyc-release history after reset to nyc-dev
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index 13f7aa3..124bd26 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -17,101 +17,104 @@
 <MediaCodecs>
     <Encoders>
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="431-431" />
-            <Limit name="measured-frame-rate-352x288" range="411-411" />
-            <Limit name="measured-frame-rate-704x576" range="141-141" />
+            <Limit name="measured-frame-rate-176x144" range="423-423" /> <!-- N=94 v98%=1.1 -->
+            <Limit name="measured-frame-rate-352x288" range="407-407" /> <!-- N=94 v98%=1.2 -->
+            <Limit name="measured-frame-rate-704x576" range="144-145" /> <!-- N=94 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="423-423" />
-            <Limit name="measured-frame-rate-720x480" range="158-158" />
-            <Limit name="measured-frame-rate-1280x720" range="74-74" />
-            <Limit name="measured-frame-rate-1920x1080" range="35-35" />
+            <Limit name="measured-frame-rate-320x240" range="412-412" /> <!-- N=94 v98%=1.1 -->
+            <Limit name="measured-frame-rate-720x480" range="165-166" /> <!-- N=94 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="72-72" /> <!-- N=94 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="35-35" /> <!-- N=94 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="326-326" />
-            <Limit name="measured-frame-rate-352x288" range="180-180" />
-            <Limit name="measured-frame-rate-640x480" range="76-76" />
+            <Limit name="measured-frame-rate-176x144" range="329-329" /> <!-- N=94 v98%=1.1 -->
+            <Limit name="measured-frame-rate-352x288" range="187-187" /> <!-- N=94 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x480" range="76-77" /> <!-- N=94 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="111-111" />
-            <Limit name="measured-frame-rate-640x360" range="100-100" />
-            <Limit name="measured-frame-rate-1280x720" range="62-62" />
-            <Limit name="measured-frame-rate-1920x1080" range="33-33" />
+            <Limit name="measured-frame-rate-320x180" range="111-111" /> <!-- N=92 v98%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="102-102" /> <!-- N=92 v98%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="71-71" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="35-35" /> <!-- N=92 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="254-254" />
+            <Limit name="measured-frame-rate-176x144" range="268-278" /> <!-- N=94 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="273-273" />
-            <Limit name="measured-frame-rate-720x480" range="122-122" />
-            <Limit name="measured-frame-rate-1280x720" range="67-67" />
-            <Limit name="measured-frame-rate-1920x1080" range="33-33" />
+            <Limit name="measured-frame-rate-320x240" range="254-254" /> <!-- N=94 v98%=1.3 -->
+            <Limit name="measured-frame-rate-720x480" range="117-117" /> <!-- N=94 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=94 v98%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="32-32" /> <!-- N=94 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="220-220" />
+            <Limit name="measured-frame-rate-176x144" range="255-305" /> <!-- N=94 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="68-68" />
-            <Limit name="measured-frame-rate-640x360" range="41-41" />
-            <Limit name="measured-frame-rate-1280x720" range="30-30" />
-            <Limit name="measured-frame-rate-1920x1080" range="15-15" />
+            <Limit name="measured-frame-rate-320x180" range="71-76" /> <!-- N=92 v98%=1.4 -->
+            <Limit name="measured-frame-rate-640x360" range="39-44" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="30-30" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=92 v98%=1.0 -->
         </MediaCodec>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="485-485" />
-            <Limit name="measured-frame-rate-352x288" range="456-456" />
+            <Limit name="measured-frame-rate-176x144" range="542-548" /> <!-- N=92 v98%=1.2 -->
+            <Limit name="measured-frame-rate-352x288" range="495-525" /> <!-- N=92 v98%=1.2 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="258-258" />
-            <Limit name="measured-frame-rate-720x480" range="175-175" />
-            <Limit name="measured-frame-rate-1280x720" range="127-127" />
-            <Limit name="measured-frame-rate-1920x1088" range="60-60" />
+            <Limit name="measured-frame-rate-320x240" range="250-266" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-720x480" range="184-184" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="121-121" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1088" range="59-60" /> <!-- N=92 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="396-396" />
-            <Limit name="measured-frame-rate-640x360" range="238-238" />
-            <Limit name="measured-frame-rate-720x480" range="223-223" />
-            <Limit name="measured-frame-rate-1280x720" range="147-147" />
-            <Limit name="measured-frame-rate-1920x1080" range="91-91" />
+            <Limit name="measured-frame-rate-352x288" range="374-398" /> <!-- N=92 v98%=1.3 -->
+            <Limit name="measured-frame-rate-640x360" range="244-266" /> <!-- N=92 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="239-252" /> <!-- N=92 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="157-157" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="92-92" /> <!-- N=92 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="494-494" />
-            <Limit name="measured-frame-rate-480x360" range="429-429" />
+            <Limit name="measured-frame-rate-176x144" range="521-524" /> <!-- N=92 v98%=1.2 -->
+            <Limit name="measured-frame-rate-480x360" range="460-471" /> <!-- N=92 v98%=1.2 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="343-343" />
-            <Limit name="measured-frame-rate-640x360" range="335-335" />
-            <Limit name="measured-frame-rate-1280x720" range="353-353" />
-            <Limit name="measured-frame-rate-1920x1080" range="201-201" />
+            <Limit name="measured-frame-rate-320x180" range="351-353" /> <!-- N=92 v98%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="338-341" /> <!-- N=92 v98%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="361-366" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="204-204" /> <!-- N=92 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="154-154" />
+            <Limit name="measured-frame-rate-176x144" range="103-105" /> <!-- N=92 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="313-313" />
-            <Limit name="measured-frame-rate-720x480" range="173-173" />
-            <Limit name="measured-frame-rate-1280x720" range="81-81" />
-            <Limit name="measured-frame-rate-1920x1080" range="38-38" />
+            <Limit name="measured-frame-rate-320x240" range="330-409" /> <!-- N=92 v98%=1.4 -->
+            <Limit name="measured-frame-rate-720x480" range="213-213" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="79-80" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="37-38" /> <!-- N=92 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="319-319" />
-            <Limit name="measured-frame-rate-640x360" range="176-176" />
-            <Limit name="measured-frame-rate-720x480" range="149-149" />
-            <Limit name="measured-frame-rate-1280x720" range="69-69" />
-            <Limit name="measured-frame-rate-1920x1080" range="37-37" />
+            <Limit name="measured-frame-rate-352x288" range="312-340" /> <!-- N=92 v98%=1.3 -->
+            <Limit name="measured-frame-rate-640x360" range="233-234" /> <!-- N=92 v98%=1.3 -->
+            <Limit name="measured-frame-rate-720x480" range="192-192" /> <!-- N=92 v98%=1.3 -->
+            <Limit name="measured-frame-rate-1280x720" range="85-88" /> <!-- N=92 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="53-53" /> <!-- N=92 v98%=1.1 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="121-123" /> <!-- N=92 v98%=1.1 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="403-403" />
-            <Limit name="measured-frame-rate-640x360" range="169-169" />
-            <Limit name="measured-frame-rate-1280x720" range="59-59" />
-            <Limit name="measured-frame-rate-1920x1080" range="24-24" />
+            <Limit name="measured-frame-rate-320x180" range="465-465" /> <!-- N=92 v98%=1.3 -->
+            <Limit name="measured-frame-rate-640x360" range="193-203" /> <!-- N=92 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="58-59" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="24-25" /> <!-- N=92 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="209-209" />
-            <Limit name="measured-frame-rate-640x360" range="84-84" />
-            <Limit name="measured-frame-rate-1280x720" range="38-38" />
-            <Limit name="measured-frame-rate-1920x1080" range="26-26" />
+            <Limit name="measured-frame-rate-320x180" range="256-256" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="97-97" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="40-40" /> <!-- N=92 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="26-27" /> <!-- N=92 v98%=1.1 -->
         </MediaCodec>
     </Decoders>
 </MediaCodecs>