Merge "Extend toolbox with SE Android support."