Merge "ARM: arch_timer: force re-selection of the best clocksource" into msm-4.9