am 75a874fd: am 04e01d9e: am 8d6148cd: am 209af33a: Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor" into klp-dev

* commit '75a874fd94e7e38cfd75e7b2f6dad57fe12f27c0':
  Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor