Merge "Revert "Disable test due to toybox update."" am: 4559e72589
am: 76474ae203

* commit '76474ae2037632067cc20ec67a3f194692149ae9':
  Revert "Disable test due to toybox update."