Merge "Revert "ginstall: add flash unlock support for gflt""