2.5 bump
Merge branch 'jellybean' of https://github.com/XYAOSP/vendor_aosp into jellybean