Framework: Fix build

Fixes problem introduced with http://review.cyanogenmod.org/#/c/32242

Change-Id: I7a0b17522bc8df0324856af3178f757dba8e449a
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1