Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev