Merge "manifest.xml: fix IMapper incompatible build error"