Reconcile with gingerbread-mr4-release

Change-Id: I23cc7b0d87009f561a4b0dae352b5fb445530c91
tree: 39ff6a58356d7378da632404cd94e0749c904e82
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk