otter: Follow kernel change

Change-Id: If1eaf8c48e41aed3e4cc36de903702275787b5c6
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0