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

Change-Id: Ia24c4c3e2c3754509934576e30e500f1f5aa1a12