Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor" into klp-dev