Change spring-context.xml to beans.xml

Change-Id: Ib3256f6f422695755c37ce7d16867459e548990c