Merge "Remove VTS_ROOT_PATH." am: 3a453efbae
am: 34be18f87e

Change-Id: Ic75901c37d38072119afeb71fcdde366e839ffb1