Merge "Revert "Correct some GSI settings to board makefile""
am: 0b733a2036

Change-Id: Ic65bb3e53edfa015d62fe09aa318b036aa5e106a