Reconcile with ics-mr1-release

Change-Id: Ieb9ac03bc8a3983b12d0c38081ad962188b2a724
tree: afb7e8fb6409cb89b1bf994a28ce2f5ca2262577
  1. java/
  2. res/
  3. tests/
  4. Android.mk