Fix adding lockscreen targets.

The empty targets were not included in the setting properly.
Also make the code a little more memory efficient.

Change-Id: I05cc7ce55ef5789f063033116ebfd9337e5ee28a
Remove unused stuff.

Change-Id: If733fef2e11349c7d07d36c476521f26916a0318
Remove debug leftovers.

Change-Id: I8d800829fe2f404810575d767cff864cf74cc80b
Merge "Remove unused stuff." into cm-10.2
Merge "Fix adding lockscreen targets." into cm-10.2
Merge branch 'cm-10.2' into martincz