am 452de9c9: Merge "More test_defs cleanup." into froyo

Merge commit '452de9c984b7a21a2208834260a9bb6ce1b0d1a2' into froyo-plus-aosp

* commit '452de9c984b7a21a2208834260a9bb6ce1b0d1a2':
  More test_defs cleanup.