Merge "Added bts firmware from HTC ICS" into jellybean