am 1e1b24ba: am d6aae2e8: Merge "Cleanup framework test defs." into froyo