Merge "Fix integer sanitizer in clearkey."
am: 2c5f9f1b33

Change-Id: Id2e4fc647f42f9a62ca292a73d224ceeadb9316c