Update projects for new source tree layout

In makefiles, all trusty kernel modules should be referenced as
trusty/kernel/XXXX and all trusty apps should be referenced as
trusty/user/app/XXXX.

Bug: 111521896
Change-Id: Iae6431c9768614f7d76615efe9c5a51ec8f04a16
diff --git a/project/vexpress-a15-trusty.mk b/project/vexpress-a15-trusty.mk
index 0b66e75..cf8b08d 100644
--- a/project/vexpress-a15-trusty.mk
+++ b/project/vexpress-a15-trusty.mk
@@ -49,8 +49,8 @@
 # Modules to be compiled into lk.bin
 #
 MODULES += \
-	lib/sm \
-	lib/trusty \
+	trusty/kernel/lib/sm \
+	trusty/kernel/lib/trusty \
 
 TRUSTY_USER_ARCH := arm
 
@@ -63,8 +63,8 @@
 
 # compiled from source
 TRUSTY_ALL_USER_TASKS := \
-	sample/skel \
-	sample/skel2\
-	sample/timer\
+	trusty/user/app/sample/skel \
+	trusty/user/app/sample/skel2\
+	trusty/user/app/sample/timer\
 
 EXTRA_BUILDRULES += app/trusty/user-tasks.mk