Updates
Merge branch 'CarbonJB3' of https://github.com/STELIX/android_device_htc_enrc2b into CarbonJB3