Reconcile with ics-mr1-release

Change-Id: Ia3848190eea2c55f7c26e85782430e40680bbe97
tree: 37b7af03344cc138b5e02f5e3874846cca9bcc2e
  1. java/
  2. res/
  3. tests/
  4. Android.mk