merge jellybean into cm-10.1 to fix x86 build

See discussion in http://review.cyanogenmod.org/32336