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

* commit '1cd04c8275bf97407494e356ee07f1f7d38517bd':
  Add missing ioctl wrappers for Nexus 7.
tree: 07f02fd0ed9224bac2cd2f1a1ccebde9623c3450
  1. main/
  2. unittest/
  3. Android.mk