Reconcile with ics-mr1-release

Change-Id: Idb62646b6cad3f0e0af4520e940799b7a31d6dac
tree: 362afa1a0fcf17419a89a14a13eb61aec9d43efc
  1. java/
  2. res/
  3. tests/
  4. Android.mk