Merge "Update to new native activity APIs." into gingerbread