Android 3.0 release 1
am 0c01eb3a: (-s ours) DO NOT MERGE Reverse meaning of ANDROID_STUB C flag.

Merge commit '0c01eb3a7313a580fe34044bcdc3337d067c8a15'

* commit '0c01eb3a7313a580fe34044bcdc3337d067c8a15':
  DO NOT MERGE Reverse meaning of ANDROID_STUB C flag.