am 1ea9fce4: Merge "Extend toolbox with SE Android support."

* commit '1ea9fce46f9782a21071b683b183226cb3468a0f':
  Extend toolbox with SE Android support.