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

* commit '29ca053ab3584e3a07f98990dafbca8e572b5413':
  Generalize support library tests.