Merge "Move a.h.g.composer@2.1-resources into system_ext"