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