Merge from Widevine repo of http://go/wvgerrit/168657 Some people who have left were still in OWNERS files and TODOs. Bug: 274772704 Test: comments only Change-Id: I583da815586e5ca52316b2e238d1c1bb3a5e919a
Bug: 158761377 Test: refactoring CL. Existing unit tests still pass. Change-Id: I9b91d16e92679e76d57cfc332342eaa7e6989907