gn2bp: Fix arg normalization and remove hack in the VersionSanitizer

There are cmd diffs in Android.bp.swp but it is verified the updated
cmds works.

Test: ./update_results.sh
Change-Id: Iaf916f9de12b18b4e5402fcccd2b154f72a6ac8d
2 files changed