am b66fe7bf: am d45867a4: Merge "Update platformDir search in tests." into mnc-dev

* commit 'b66fe7bfd1604f10ae81d65f56051661f34487c2':
  Update platformDir search in tests.