Corrected frameworks/base branch (aosp-ics to b2g)