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

Change-Id: Ic6422832379d008311c7727f99090251d73bba6b