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

Merge commit 'd6aae2e84b337bb887cf5fcc21b613a4d4151eb6' into froyo-plus-aosp

* commit 'd6aae2e84b337bb887cf5fcc21b613a4d4151eb6':
  Cleanup framework test defs.