Merge from Widevine repo of http://go/wvgerrit/26940 b/38014227 b/38016711 Test: built sdk_phone_mips Change-Id: Ibcdbf49f96e976f51c38db25a944268a86a1671e
Merge from Widevine repo of http://go/wvgerrit/26940 b/38014227 b/38016711 Test: built sdk_phone_mips Change-Id: Ibcdbf49f96e976f51c38db25a944268a86a1671e