Vendor cleanup
Merge branch 'jellybean' of github.com:XYAOSP/vendor_aosp into jellybean