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

Change-Id: Ic8286b248b6c9554ac262d39646d5c768359ecbb