Remove spn-conf.xml
am: aebe1d6b3b

Change-Id: I3dcb38da02d525afa083090a5a74146cb7c7ef6d