Merge "Add missing ioctl wrappers for Nexus 7."