Merge "trace: Modify timer_start and irq_handler_entry trace events." into msm-3.4