base: fix public api breakage

Change-Id: Ic25b507e66d42ae172cf031e97d14965d3a54aa0
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge branch 'cm-12.0' of https://www.github.com/cyanogenmod/android_frameworks_base into cm-12.0