am 39ffbccd: Generalize support library tests.

* commit '39ffbccdd4ab42922c9bdf0ec5d52ce1b21821f3':
  Generalize support library tests.