Merge "FIONCLEX: fix MIPS ioctl number" am: afdcd959d7
am: 063068f8c8

Change-Id: I50c61f6bdc2712b2ab0baaaabc6f1090b8efdb9d