am 700428d8: am 8c56cd9e: Reconcile with ics-mr1-release

* commit '700428d8f73604f27f4416fd14d3ef1cb86fca9e':
tree: 0c8cee709244125a772ca1319d01089a8bd369f3
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk