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

* commit '425c0f9eb7c6095d261644997658776dc9921166':
  Remove toolbox ioctl.

Change-Id: Ie3018a158829001f16dbcfa525e6f15c8b31f241