Merge "Fix bugs regarding CTS fails for VP8 codec with low performance" into lollipop-mr1-cts-dev