Reconcile with ics-mr1-release

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