Merge "configs: msmsteppe: enable gki for msm-5.4"