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 '04e01d9e154c7d01b1e3ef3b99a7e519d0553720':
  Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor