Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: Ibcd6e2299e3f03df1a5320041404a42a20546a57
tree: 610ff3dccba0d220965b8068d53895fa0be92dc7
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk