Merge "DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clients"