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