Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev am: 3d9381b5f9 am: 7410ffbe21 am: 8a017dc88a am: 8575f8995d am: b2de036e3b am: a4f15c619b am: 79dae3ced2 am: 38ddc6b7ee
am: 133a1083a3

* commit '133a1083a3d5389fec9ae2d064177ad9ba0fbe6e':
  Fix bugs regarding CTS fails for VP8 codec with low performance