am 95f03e6a: Merge "Fix make test exclusion bugs."

* commit '95f03e6a4737f90685fab86e98709f1c4393d5ef':
  Fix make test exclusion bugs.