am b9049084: Merge change 25191 into donut-gms

Merge commit 'b9049084630d2652d18efd2f6082153cf0ea516c' into eclair

* commit 'b9049084630d2652d18efd2f6082153cf0ea516c':
  CTS: fix some tests with internal references.
tree: 3ae1c1adf6036f28cd843191bd6ad3bd385bcda7
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk