am 5fee78e7: am da1951ec: Merge "Added the ability to test CanvasClients vs. XML layouts in software and hardware." into lmp-dev

* commit '5fee78e7b924b2dfad66e1819ae5062e9ad8aadb':