Merge "Preserve errno better in native_handle functions." am: dd6e73f432
am: 4b6b4e02ed

Change-Id: I878ed6ea39c72ac21522552ffc4af5210e83a7c1