Merge "Remove obsolete droidstub args"