Reconcile with ics-mr1-release

Change-Id: Ia57adebd52f816b4c6ba17221867ddd9bcc3fa3b
tree: c65ae81b87e6a2fefec33ce0dd7b7f94ffaf6113
  1. res/
  2. src/
  3. test/
  4. android-changes.txt
  5. Android.mk
  6. build.xml
  7. moe.sh
  8. NOTICE