am 8c56cd9e: Reconcile with ics-mr1-release

* commit '8c56cd9e0bc2808d73e6596ba3bb128cc2fbcd7c':
tree: fa283e7ed283b12e692729a860fb51315d130d78
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk