Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp