Merge "Trusty: update architecture source files for Trusty" am: 8e6bcab360

Change-Id: I5b3a323759e111a34c7c602473ac1e525e213238