am 593d6d4a: Reconcile with ics-mr1-release

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