Merge change I5123e63a into eclair

* changes:
  Fix CTS dpi tests.
tree: ff5254310131c1e7730986e23faf70b88c18ed69
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk