am d8f30c2b: am 2c1cc061: am 56c72f4c: am 5b886bb0: (-s ours) am 899daf75: am d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit 'd8f30c2b2dc9e27b72ad81d7b4afbf0777a5b243': Update platformDir search in tests. [DO NOT MERGE]
This commit is contained in: