Merge "Triggerfish: enabled CORE_CTRL for controlling in runtime" into android-msm-fossil-4.9