Merge "sintf.xml => manifest.xml"