Merge 'goog/honeycomb-plus-aosp' into 'goog/gingerbread-plus-aosp'

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