Framework: fix double-underscore derp

Change-Id: I6317ac69fa1972929f1baa854e79295496669c14
Merge "Framework: fix double-underscore derp" into cm-10.2
merge changes from CyanogenMod 10.2 into local branch