am 352879f1: Merge change 21813 into donut

Merge commit '352879f1c0168e06be3629fde141e2c74b48e566' into eclair

* commit '352879f1c0168e06be3629fde141e2c74b48e566':
  CTS: Fix console search for test packages
tree: 7e155cec2e07c728cea1e4bde5fc86cf526b286b
  1. tests/
  2. tools/
  3. Android.mk