merge in nyc-bugfix-release history after reset to nyc-dev
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index ace9847..49007d2 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -17,138 +17,129 @@
 <MediaCodecs>
     <Encoders>
         <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="320-322" /> <!-- N=132 v98%=1.6 -->
-            <!-- measured 98%:79-415 med:266 FLAKY(mn=78.8 < 80 - 416 < mx=524.1) variance:2.3 WIDEN(79 - 526) -->
-            <Limit name="measured-frame-rate-352x288" range="155-263" /> <!-- N=132 -->
+            <Limit name="measured-frame-rate-176x144" range="322-322" /> <!-- N=128 v98%=1.6 -->
+            <!-- measured 98%:77-346 med:231 FLAKY(78 - 346 < mx=349.2) variance:2.1 -->
+            <Limit name="measured-frame-rate-352x288" range="155-173" /> <!-- N=128 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
-            <!-- measured 98%:98-354 med:267 FLAKY(94 - 374 < mx=496.8) WIDEN(94 - 498) -->
-            <Limit name="measured-frame-rate-320x240" range="187-249" /> <!-- N=132 v98%=1.9 -->
-            <!-- measured 97%:23-181 med:79 FLAKY(mn=22.6 < 23 - 182 < mx=190.5) variance:2.8 WIDEN(23 - 184) -->
-            <Limit name="measured-frame-rate-720x480" range="46-92" /> <!-- N=132 -->
-            <!-- measured 93%:25-92 med:57 FLAKY(mn=15.4 < 24 - 96) WIDEN(15 - 96) -->
-            <Limit name="measured-frame-rate-1280x720" range="30-48" /> <!-- N=132 v93%=1.9 -->
-            <!-- measured 93%:12-42 med:21 FLAKY(mn=7.3 < 11 - 46) WIDEN(7 - 46) -->
-            <Limit name="measured-frame-rate-1920x1080" range="14-23" /> <!-- N=132 v93%=1.8 -->
+            <Limit name="measured-frame-rate-320x240" range="194-194" /> <!-- N=127 v98%=1.9 -->
+            <!-- measured 98%:22-172 med:80 FLAKY(22 - 172 < mx=174.5) variance:2.8 -->
+            <Limit name="measured-frame-rate-720x480" range="44-86" /> <!-- N=128 -->
+            <!-- measured 98%:15-94 med:57 variance:2.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="31-47" /> <!-- N=128 -->
+            <!-- measured 98%:7-43 med:22 variance:2.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="15-22" /> <!-- N=128 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true">
-            <!-- measured 98%:100-447 med:312 FLAKY(mn=98.2 < 101 - 448 < mx=449.2) variance:2.1 WIDEN(98 - 450) -->
-            <Limit name="measured-frame-rate-320x240" range="196-225" /> <!-- N=132 -->
-            <!-- measured 97%:22-180 med:82 FLAKY(mn=22.2 < 23 - 180) variance:2.8 WIDEN(23 - 180) -->
-            <Limit name="measured-frame-rate-720x480" range="45-90" /> <!-- N=132 -->
-            <!-- was 98%:15-80 med:56 FLAKY(16 - 80 < mx=87.3) variance:2.2 -->
-            <!-- measured 93%:25-70 med:60 FLAKY(mn=15.3 < 21 - 84) WIDEN(15 - 88) -->
-            <Limit name="measured-frame-rate-1280x720" range="30-44" /> <!-- N=132 v93%=1.7 -->
-            <!-- measured 93%:12-42 med:30 FLAKY(mn=7.6 < 12 - 46) WIDEN(8 - 46) -->
-            <Limit name="measured-frame-rate-1920x1080" range="15-23" /> <!-- N=132 v93%=1.8 -->
-            <!-- measured 90%:5-20 med:9 FLAKY(mn=2.1 < 5 - 20 < mx=25.6) WIDEN(4 - 26) -->
-            <Limit name="measured-frame-rate-3840x2160" range="7-13" /> <!-- N=267 v90%=1.9 -->
+            <!-- measured 98%:102-448 med:273 FLAKY(mn=100.0 < 102 - 448 < mx=449.8) variance:2.1 -->
+            <Limit name="measured-frame-rate-320x240" range="204-224" /> <!-- N=136 -->
+            <!-- measured 98%:21-168 med:80 FLAKY(22 - 168 < mx=168.5) variance:2.8 -->
+            <Limit name="measured-frame-rate-720x480" range="43-84" /> <!-- N=136 -->
+            <!-- measured 98%:15-80 med:56 FLAKY(16 - 80 < mx=87.3) variance:2.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="31-40" /> <!-- N=136 -->
+            <!-- measured 98%:7-43 med:22 variance:2.4 -->
+            <Limit name="measured-frame-rate-1920x1080" range="15-22" /> <!-- N=134 -->
+            <!-- measured 98%:5-26 med:9 variance:2.1 -->
+            <Limit name="measured-frame-rate-3840x2160" range="9-13" /> <!-- N=136 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="277-283" /> <!-- N=132 v98%=1.4 -->
-            <Limit name="measured-frame-rate-352x288" range="133-136" /> <!-- N=132 v98%=1.7 -->
-            <Limit name="measured-frame-rate-640x480" range="64-78" /> <!-- N=132 v90%=1.1 -->
+            <Limit name="measured-frame-rate-176x144" range="283-283" /> <!-- N=136 v98%=1.4 -->
+            <Limit name="measured-frame-rate-352x288" range="136-136" /> <!-- N=136 v98%=1.7 -->
+            <Limit name="measured-frame-rate-640x480" range="64-64" /> <!-- N=136 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="122-122" /> <!-- N=132 v98%=1.0 -->
-            <Limit name="measured-frame-rate-640x360" range="83-100" /> <!-- N=132 v90%=1.2 -->
-            <!-- measured 90%:25-39 med:39 FLAKY(mn=15.4 < 16 - 64) WIDEN(15 - 64) -->
-            <Limit name="measured-frame-rate-1280x720" range="25-32" /> <!-- N=132 v90%=1.2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="11-14" /> <!-- N=132 v90%=1.1 -->
+            <Limit name="measured-frame-rate-320x180" range="122-122" /> <!-- N=128 v98%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="83-83" /> <!-- N=128 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="25-25" /> <!-- N=125 v98%=1.6 -->
+            <Limit name="measured-frame-rate-1920x1080" range="11-11" /> <!-- N=126 v98%=1.4 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="181-181" /> <!-- N=132 v98%=1.5 -->
+            <Limit name="measured-frame-rate-176x144" range="181-181" /> <!-- N=128 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <!-- was 98%:56-288 med:151 FLAKY(56 - 288 < mx=289.7) variance:2.3 -->
-            <!-- measured 98%:53-244 med:157 FLAKY(mn=52.5 < 54 - 244 < mx=280.0) variance:2.1 WIDEN(53 - 280) -->
-            <Limit name="measured-frame-rate-320x240" range="105-144" /> <!-- N=132 -->
-            <!-- measured 98%:19-126 med:48 FLAKY(mn=19.2 < 20 - 126 < mx=126.4) variance:2.5 WIDEN(19 - 128) -->
-            <Limit name="measured-frame-rate-720x480" range="38-75" /> <!-- N=132 -->
-            <Limit name="measured-frame-rate-1280x720" range="17-17" /> <!-- N=132 v98%=1.7 -->
-            <Limit name="measured-frame-rate-1920x1080" range="8-8" /> <!-- N=132 v98%=1.7 -->
+            <!-- measured 98%:56-288 med:151 FLAKY(56 - 288 < mx=289.7) variance:2.3 -->
+            <Limit name="measured-frame-rate-320x240" range="112-144" /> <!-- N=128 -->
+            <Limit name="measured-frame-rate-720x480" range="49-75" /> <!-- N=128 v98%=1.7 -->
+            <!-- measured 93%:10-27 med:22 FLAKY(9 - 34 < mx=65.7) -->
+            <Limit name="measured-frame-rate-1280x720" range="17-17" /> <!-- N=128 v93%=1.6 -->
+            <!-- measured 98%:4-14 med:10 FLAKY(4 - 16 < mx=23.7) -->
+            <Limit name="measured-frame-rate-1920x1080" range="8-8" /> <!-- N=128 v98%=1.7 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="186-192" /> <!-- N=132 v98%=1.5 -->
+            <Limit name="measured-frame-rate-176x144" range="192-192" /> <!-- N=134 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="60-60" /> <!-- N=132 v98%=1.7 -->
-            <Limit name="measured-frame-rate-640x360" range="30-31" /> <!-- N=132 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1280x720" range="15-15" /> <!-- N=132 v98%=1.7 -->
-            <Limit name="measured-frame-rate-1920x1080" range="7-7" /> <!-- N=132 v98%=1.5 -->
+            <Limit name="measured-frame-rate-320x180" range="60-60" /> <!-- N=128 v98%=1.7 -->
+            <Limit name="measured-frame-rate-640x360" range="30-30" /> <!-- N=123 v98%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="15-15" /> <!-- N=128 v98%=1.7 -->
+            <Limit name="measured-frame-rate-1920x1080" range="7-7" /> <!-- N=128 v98%=1.5 -->
         </MediaCodec>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="578-591" /> <!-- N=134 v98%=1.3 -->
-            <Limit name="measured-frame-rate-352x288" range="595-611" /> <!-- N=134 v98%=1.4 -->
+            <Limit name="measured-frame-rate-176x144" range="578-578" /> <!-- N=128 v98%=1.4 -->
+            <Limit name="measured-frame-rate-352x288" range="611-611" /> <!-- N=128 v98%=1.3 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="336-340" /> <!-- N=134 v98%=1.3 -->
-            <Limit name="measured-frame-rate-720x480" range="239-278" /> <!-- N=134 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1280x720" range="150-166" /> <!-- N=134 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1088" range="73-74" /> <!-- N=134 v98%=1.0 -->
+            <Limit name="measured-frame-rate-320x240" range="340-340" /> <!-- N=128 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="278-278" /> <!-- N=128 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="151-166" /> <!-- N=128 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1088" range="74-74" /> <!-- N=127 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="442-465" /> <!-- N=134 v98%=1.4 -->
-            <Limit name="measured-frame-rate-640x360" range="340-340" /> <!-- N=134 v98%=1.4 -->
-            <Limit name="measured-frame-rate-720x480" range="289-301" /> <!-- N=134 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1280x720" range="194-227" /> <!-- N=134 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="109-128" /> <!-- N=134 v98%=1.2 -->
-            <Limit name="measured-frame-rate-3840x2160" range="33-34" /> <!-- N=134 v98%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="442-465" /> <!-- N=126 v98%=1.3 -->
+            <Limit name="measured-frame-rate-640x360" range="340-340" /> <!-- N=126 v98%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="301-301" /> <!-- N=126 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="214-227" /> <!-- N=124 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="128-128" /> <!-- N=126 v98%=1.0 -->
+            <Limit name="measured-frame-rate-3840x2160" range="33-33" /> <!-- N=125 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="574-575" /> <!-- N=133 v98%=1.3 -->
-            <Limit name="measured-frame-rate-480x360" range="509-551" /> <!-- N=134 v98%=1.3 -->
+            <Limit name="measured-frame-rate-176x144" range="574-574" /> <!-- N=126 v98%=1.3 -->
+            <Limit name="measured-frame-rate-480x360" range="551-551" /> <!-- N=125 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="400-404" /> <!-- N=132 v98%=1.1 -->
-            <Limit name="measured-frame-rate-640x360" range="381-397" /> <!-- N=134 v98%=1.1 -->
-            <Limit name="measured-frame-rate-1280x720" range="392-424" /> <!-- N=134 v98%=1.3 -->
-            <Limit name="measured-frame-rate-1920x1080" range="239-248" /> <!-- N=134 v98%=1.0 -->
+            <Limit name="measured-frame-rate-320x180" range="404-404" /> <!-- N=126 v98%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="397-397" /> <!-- N=126 v98%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="424-424" /> <!-- N=126 v98%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="248-248" /> <!-- N=126 v98%=1.0 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <!-- measured 98%:116-297 med:130 SLOW -->
-            <Limit name="measured-frame-rate-176x144" range="130-188" /> <!-- N=134 v98%=1.6 -->
+            <Limit name="measured-frame-rate-176x144" range="141-188" /> <!-- N=128 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <!-- was 98%:74-403 med:361 FLAKY(mn=68.1 < 75 - 404 < mx=404.5) variance:2.3 -->
-            <!-- measured 98%:73-383 med:328 FLAKY(mn=72.8 < 74 - 384 < mx=393.2) variance:2.3 WIDEN(73 - 394) -->
-            <Limit name="measured-frame-rate-320x240" range="145-202" /> <!-- N=134 -->
-            <Limit name="measured-frame-rate-720x480" range="63-66" /> <!-- N=134 v98%=1.8 -->
-            <Limit name="measured-frame-rate-1280x720" range="24-26" /> <!-- N=134 v98%=1.7 -->
-            <Limit name="measured-frame-rate-1920x1080" range="10-11" /> <!-- N=134 v98%=1.7 -->
+            <!-- measured 98%:74-403 med:361 FLAKY(mn=68.1 < 75 - 404 < mx=404.5) variance:2.3 -->
+            <Limit name="measured-frame-rate-320x240" range="149-202" /> <!-- N=128 -->
+            <Limit name="measured-frame-rate-720x480" range="66-66" /> <!-- N=128 v98%=1.8 -->
+            <Limit name="measured-frame-rate-1280x720" range="26-26" /> <!-- N=127 v98%=1.7 -->
+            <Limit name="measured-frame-rate-1920x1080" range="11-11" /> <!-- N=127 v98%=1.8 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <!-- was 98%:90-360 med:307 FLAKY(mn=88.8 < 90 - 360 < mx=371.6) -->
-            <!-- measured 98%:85-342 med:286 FLAKY(mn=83.7 < 86 - 342 < mx=350.4) WIDEN(84 - 352) -->
-            <Limit name="measured-frame-rate-352x288" range="167-186" /> <!-- N=134 v98%=2.0 -->
-            <Limit name="measured-frame-rate-640x360" range="75-85" /> <!-- N=134 v98%=1.9 -->
-            <Limit name="measured-frame-rate-720x480" range="70-79" /> <!-- N=134 v98%=1.8 -->
-            <Limit name="measured-frame-rate-1280x720" range="29-31" /> <!-- N=134 v98%=1.6 -->
-            <Limit name="measured-frame-rate-1920x1080" range="17-19" /> <!-- N=134 v98%=1.5 -->
+            <!-- measured 98%:90-360 med:307 FLAKY(mn=88.8 < 90 - 360 < mx=371.6) -->
+            <Limit name="measured-frame-rate-352x288" range="180-180" /> <!-- N=125 v98%=2.0 -->
+            <Limit name="measured-frame-rate-640x360" range="85-85" /> <!-- N=126 v98%=2.0 -->
+            <Limit name="measured-frame-rate-720x480" range="79-79" /> <!-- N=125 v98%=1.9 -->
+            <Limit name="measured-frame-rate-1280x720" range="31-31" /> <!-- N=126 v98%=1.6 -->
+            <Limit name="measured-frame-rate-1920x1080" range="19-19" /> <!-- N=126 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <!-- measured 98%:137-385 med:189 SLOW -->
-            <Limit name="measured-frame-rate-176x144" range="189-240" /> <!-- N=134 v98%=1.7 -->
+            <Limit name="measured-frame-rate-176x144" range="195-240" /> <!-- N=126 v98%=1.6 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <!-- was 98%:172-723 med:583 FLAKY(mn=165.2 < 172 - 724 < mx=817.7) variance:2.0 -->
-            <!-- measured 98%:161-602 med:398 FLAKY(156 - 624 < mx=663.1) WIDEN(156 - 664) -->
-            <Limit name="measured-frame-rate-320x180" range="312-409" /> <!-- N=134 v98%=1.9 -->
-            <!-- measured 98%:47-216 med:152 FLAKY(47 - 216 < mx=225.2) variance:2.1 WIDEN(47 - 226) -->
-            <Limit name="measured-frame-rate-640x360" range="94-113" /> <!-- N=134 -->
-            <!-- measured 98%:11-45 med:31 variance:2.0 -->
-            <Limit name="measured-frame-rate-1280x720" range="22-23" /> <!-- N=134 -->
-            <Limit name="measured-frame-rate-1920x1080" range="8-9" /> <!-- N=134 v98%=2.0 -->
+            <!-- measured 98%:172-723 med:583 FLAKY(mn=165.2 < 172 - 724 < mx=817.7) variance:2.0 -->
+            <Limit name="measured-frame-rate-320x180" range="344-362" /> <!-- N=126 -->
+            <!-- measured 98%:49-222 med:208 FLAKY(49 - 222 < mx=223.1) variance:2.1 -->
+            <Limit name="measured-frame-rate-640x360" range="98-111" /> <!-- N=126 -->
+            <Limit name="measured-frame-rate-1280x720" range="22-23" /> <!-- N=126 v98%=2.0 -->
+            <!-- measured 98%:4-18 med:16 FLAKY(4 - 18 < mx=18.1) variance:2.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="8-9" /> <!-- N=122 -->
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <!-- was 98%:111-453 med:328 FLAKY(mn=107.4 < 111 - 454 < mx=460.4) variance:2.0 -->
-            <!-- measured 98%:104-345 med:249 FLAKY(95 - 380 < mx=402.7) WIDEN(95 - 404) -->
-            <Limit name="measured-frame-rate-320x180" range="190-230" /> <!-- N=134 v98%=1.8 -->
-            <Limit name="measured-frame-rate-640x360" range="77-83" /> <!-- N=134 v98%=1.7 -->
-            <Limit name="measured-frame-rate-1280x720" range="28-32" /> <!-- N=134 v98%=1.5 -->
-            <Limit name="measured-frame-rate-1920x1080" range="18-19" /> <!-- N=134 v98%=1.5 -->
+            <!-- measured 98%:111-453 med:328 FLAKY(mn=107.4 < 111 - 454 < mx=460.4) variance:2.0 -->
+            <Limit name="measured-frame-rate-320x180" range="222-227" /> <!-- N=126 -->
+            <Limit name="measured-frame-rate-640x360" range="83-83" /> <!-- N=125 v98%=1.7 -->
+            <Limit name="measured-frame-rate-1280x720" range="32-32" /> <!-- N=126 v98%=1.6 -->
+            <Limit name="measured-frame-rate-1920x1080" range="19-19" /> <!-- N=126 v98%=1.5 -->
         </MediaCodec>
     </Decoders>
 </MediaCodecs>