galaxys2-common: match API to AOSP

See: http://review.cyanogenmod.org/#/c/52047/

Change-Id: I825527ec4a298f98ae6606e6b9ae4b41d5bc8f21
Merge branch 'cm-10.2' into martincz