Lockscreen Wallpaper [2/2]

PS2: clean up ~ files

Change-Id: I4b5634d7dfd1e04a2f36a966280b01599555032a

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java