Merge from gingerbread

Change-Id: I5920ee81eefdf7d4250813bfcf03583a2973c9e3
tree: 8c64b09a7568ff5846b3000668c71b8774ffa0d1
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk