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

Change-Id: I050860b792d1dd72dfc5ad056fc6c398a299dbc6