Merge "Update native_activity sample to use new glue code." into gingerbread