Reconcile with gingerbread-release

Change-Id: I39908f99bc7be01b37f96796af4eda04f6810802
tree: cedcc5a9b716604d421396b1c6d4aeec6872ec64
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk