(The matching reversion in the Widevine Repository is http://go/wvgerrit/69923) This reverts commit c207ef8ea6. Reason for revert: Widevine Buildbot failures Change-Id: Ied9e36f9eaa94bb7e9cd13b8dff7a2cbdca07a07
c207ef8ea6