Reconcile with gingerbread-release

Change-Id: Ia22f150d863ffb9227d00402b23429b636c54eb4
tree: 0d27fa29891fbea7331bb4b1d747cd5a11979b54
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk