Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I30aba890393142f1c36d3c5ccd8a67ac447a54c9
tree: 902e2f9af12521715d8b4cfaa92b7829b15a7946
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk