639061d9c2
Merge commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893' * commit 'b5f05d0018d72531e40c2afadfee90e9bc0c8893': Update native activity & event APIs to follow correct conventions.