Merges missing bits from the Widevine CDM repo for https://widevine-internal-review.googlesource.com/#/c/10653 Most of this change was submitted into lmp-dev, but some tests were ommitted. This CL completes the missing changes from the original widevine repo commit. It also fixes some missing test installation commands. b/15388863 Change-Id: Id59d885780134c6c6863477f8c49fb9d8ffe509d