Reconcile with ics-mr1-release

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