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