am 87392821: Merge "Add missing ioctl wrappers for Nexus 10."

* commit '87392821575ceb19dbf92b02c8e4ded0e7dcf4fc':
  Add missing ioctl wrappers for Nexus 10.