Fix checkapi

Change-Id: I231b2dbdb0ab2c59bf8f0ba96e9f0da1303b8c7e
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2