Remove spn-conf.xml
am: 8bd783b5b0

Change-Id: Ia938d23f56b2b3db4b1768a198435373cb086f66