Reconcile with ics-mr1-release

Change-Id: I1f8bab351bcf7e2e90623aae71c725a123144440
tree: 09523ff87feb3ef06c5f13264597576d4eff3070
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk