Merge "msm: clock-8974: Update GCC debug measurement indices" into msm-3.4