Merge from gingerbread

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