Merge "Fix integer sanitizer in clearkey." am: 2c5f9f1b33 am: 35b70b7d45
am: 0e76dd5fdf  -s ours

Change-Id: I64bd9676a6dc439936eb1cfdfbaa955cc74e26da