am 081768d3: (-s ours) Merge "DO NOT MERGE: Add missing ioctl wrappers for Nexus 10."

* commit '081768d3a6d94b13d30cb7b9684fe76b0b6ba732':
  DO NOT MERGE: Add missing ioctl wrappers for Nexus 10.
tree: ab6c66050225288f9c4074975010e4828b88fb71
  1. main/
  2. unittest/
  3. Android.mk