am 1cd04c82: Merge "Add missing ioctl wrappers for Nexus 7."

* commit '1cd04c8275bf97407494e356ee07f1f7d38517bd':
  Add missing ioctl wrappers for Nexus 7.