am 778ebc04: am 21851dd5: Merge "Update to new native activity APIs." into gingerbread

Merge commit '778ebc0473d01ced3a6372f5c91ceb11cf9e95c2'

* commit '778ebc0473d01ced3a6372f5c91ceb11cf9e95c2':
  Update to new native activity APIs.