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

Change-Id: I03af96d3c6f3e188841ea5015de805d88038975b