[automerger skipped] Export maximum number of fds/ints in a native_handle. am: c1cea05b5f -s ours am skip reason: change_id I0eafff70d3a7e4d732fe600a0052efb90108208d with SHA1 02debfa2df is in history am: 479b8544c6 -s ours am skip reason: change_id I0eafff70d3a7e4d732fe600a0052efb90108208d with SHA1 02debfa2df is in history
am: c9455b4740 -s ours
am skip reason: change_id I0eafff70d3a7e4d732fe600a0052efb90108208d with SHA1 02debfa2df is in history

Change-Id: I685d84c532ebd165914abb016e8c9d1601208680