Merge "Explicitly mark dirs for testNo64 search."
am: 7d2304b17d

* commit '7d2304b17da12b92dc1f7263936877393f3ce542':
  Explicitly mark dirs for testNo64 search.