Merge changes I5aab2598,I8a9163da

* changes:
  trusty: remove the deprecated libtrusty_metrics_test
  trusty: Add trusty_stats_test to the qemu_trusty_base.mk