Reconcile with gingerbread-mr4-release

Change-Id: I4370e0216d87765c3ccb2df760327a38228b3fe8
tree: 0a96995a1e4b8f3724dcbf6ce3520bd7a478dbf6
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk