Merge "Rename modules NativeActivity"