Code drop from //branches/cupcake/...@124589
auto import from //branches/cupcake/...@125939
Merge branch 'cupcake'
auto import from //branches/cupcake/...@130745
auto import from //depot/cupcake/@135843
auto import from //depot/cupcake/@135843
Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Automated import from //branches/cupcake/...@142323,142323
Automated import from //branches/donutburger/...@142324,142324
Automated import from //branches/master/...@142325,142325
Merge commit 'korg/cupcake'
Merge branch 'open_source_no_contributions' into google_internal
Merge donut into master
merge cupcake into donut
Merge donut into master
e2fsprogs: Build if TARGET_ARCH is x86.
Merge korg/donut into korg/master
reconcile korg/master into goog/master
Merge change 9990

* changes:
  e2fsprogs: Build if TARGET_ARCH is x86.
android-2.1_r1 snapshot