Merge "gila: enabling CORE CTL for controlling in runtime" into android-msm-fossil-4.9