Reconcile with ics-mr1-release

Change-Id: Iee6e204b8a44a1efb75dea184cc1a69baac91f06
tree: fa283e7ed283b12e692729a860fb51315d130d78
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk