Merge "Update diff allowlist for soong system image build" into main