Minor post-merge cleanup.

Change-Id: Ic65ef882b61aa6506d21bbe41b9ac8473a950591
Merge "Minor post-merge cleanup." into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.2