Merge "Update platform.dir search in tests." into lmp-mr1-dev