am adef7361: Merge "Only include test targets if test-art* or build-art* is being built."

* commit 'adef736196fb8532d99489206a9c949532fffaca':
  Only include test targets if test-art* or build-art* is being built.