am 209af33a: Merge "Fix CTS android.media package testEncodeVirtualDisplay...
am 209af33a: Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor" into klp-dev
* commit '209af33a':
Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor