Merge "NativeActivity: Improve error message reporting" am: de3150db1e
am: 7de4dd6e07

Change-Id: Ifb7d744bade56fd723567cc774a2849b03cbdeb4