marvel: add GAPPs to build