Merge "Update native activity & event APIs to follow correct conventions." into gingerbread