trusty: build: de-dupe BUILTIN_USER_TASKS, print UUID on appload failure am: 1cbf76bc91

Original change: https://android-review.googlesource.com/c/trusty/lk/trusty/+/2774727

Change-Id: Ic0d3b2d24c81c7d106939d38744ea8f9154d1c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>