Merge "GSI: build pvmfw" into android15-tests-dev