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

Change-Id: Ia4e3f5089b98c507999acbd2b13160aa758e8748