Bug 1085414 - Allow apps that are symbolically linked to be unit tested

Conflicts:
	Makefile
Bug 1082563 - video playback screen remains black for few sec after suspend resume in video app
Bug 1086644 - Changing performance tests back to use legacy screen unlocking