Reconcile with gingerbread-mr4-release

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