Fix run.bat merge
Fix run.bat merge

BUILD_OPTIONS are not supposed to include the TEST and -j parameters
anymore, after recent change 4d9c14696dded8996a281143dfccd312e5efcda9
from 1.3-rel.

Change-Id: Ib8984fb8f3567d55df5465c34b193a4f35046799
Signed-off-by: Dan Mihai <ba8e1833495515b49ded9e20cae80a8129155aa9@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20491
Tested-by: jenkins-iotivity <d95b56ce41a2e1ac4cecdd398defd7414407cc08@iotivity.org>
Reviewed-by: Dave Thaler <8a98d0850f57b73c42d096f8f8b11e2d5522d554@microsoft.com>
Reviewed-by: Alex Kelley <b715314911e4c2b690fc64ea4cf8f2f989d18c99@microsoft.com>

iotivity/iotivity,iotivity/iotivity,iotivity/iotivity,iotivity/iotivity,rzr/iotivity,iotivity/iotivity,rzr/iotivity,rzr/iotivity,rzr/iotivity,rzr/iotivity,iotivity/iotivity,iotivity/iotivity,rzr/iotivity,rzr/iotivity,iotivity/iotivity