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

Change-Id: Iea68c0b8a6918f2234ef8283a978f01f2ca6b133