am 0ea348a5: am 39ffbccd: Generalize support library tests.

* commit '0ea348a5288ac4368a9e7d435043d8af50ddc5e4':
  Generalize support library tests.