am 75dc3a9d: DO NOT MERGE; Add back support for uts testing.

Merge commit '75dc3a9d28a184358127390329b36a5a520c212c' into eclair-plus-aosp

* commit '75dc3a9d28a184358127390329b36a5a520c212c':
  DO NOT MERGE; Add back support for uts testing.
tree: dfcc387680bfccb04745bd2281d1334f46f0fd86
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE