Merge "sintf.xml => manifest.xml"
am: 4657dc5778

Change-Id: I8f88db15df9e5f4ff5fc16f868aaa90c30ce76e4