am f45420d0: am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev automerge: 7e39385

* commit 'f45420d0bd912de3da9506bbae12a0e4b789bd84':
  Update platform.dir search in tests.