Fix the build

Fix a build error caused by this http://review.cyanogenmod.org/#/c/32038/  commit.

Change-Id: I83df6bf0e54160b3fcd755e7b3077d10391dbaf2
Merge remote branch 'cm/cm-10.1' into cm-10.1