Cleanup: Remove variables that were never read.

Change-Id: Ie5c0a52ce75dbed129ed499fa6babb49b325fd8f
merge changes from CyanogenMod 10.2 into local branch