Merge "remove VTS_CONFIG_SRC_DIR as no more used" am: cbb79ed0da
am: 35ba21558c

Change-Id: Ib7e884d8ca2683bb3787835ae025479937dfc6ab