Merge "Remove toolbox ioctl." am: 0fdd663262
am: ee915afa21

* commit 'ee915afa2117725bae8a083b9116dd07b4a51e7c':
  Remove toolbox ioctl.

Change-Id: I61c85490b29b2d4de2ffb9cdd7f9fa40e445c28d