Merge "fix MediaDrm.isCryptoSchemeSupported(uuid)" into klp-dev