Merge "NativeActivity: Improve error message reporting" am: de3150db am: 7de4dd6e am: ef856678 am: cfe90ab4 Change-Id: Ia4e3f5089b98c507999acbd2b13160aa758e8748