Merge "Enhance hello-jni to report APP_ABI at compilation"