Reconcile with ics-mr1-release

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