Merge "Make GSI for arm64_ab more generic" into oc-mr1-dev