Merge changes I40c9ea47,I593aeed5 am: c7878469be
am: 5cf2f5946c

* commit '5cf2f5946c5e9d09d9325a5286fe472b4e75f841':
  trusty: storage: add tests
  trusty: storage: add client lib for testing

Change-Id: I39d2c1b49e92b15190fb92b66aa20e8586716957