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

Change-Id: If697e8fcfca91ea582c88c7d236abe835aa228ea