Merge "hal: update GKI flag"