Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp
am: 8b0e069815

Change-Id: Id8c2004d6e1e4db786244afd1de48d14d21bba57