Android 6.0.1 release 24
DO NOT MERGE: Further restrict access to socket ioctl commands am: 57531cacb4 am: c0ce53cc8d
am: f290a2ddd0

* commit 'f290a2ddd08e9b27fbded7a999238b2ae4517bf5':
  DO NOT MERGE: Further restrict access to socket ioctl commands