Mass merge from gingerbread - do not merge

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