Merge "sepolicy : moving vendor testscripts to system"