Merge "NativeActivity: Improve error message reporting"