Merge "cargo2android: Fix edge case in --add_workspace feature"