Merge "Add modules for Soong-built GSI" into main