am 06850f9c: am b50d0cd5: Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev

* commit '06850f9ccd9c7668a8ab80bdfea00c1b275b5af9':
  rootdir: Make trusty version readable by dumpstate