Merge "Default to file rerun and not serial for LibcoreTest too" into oc-dev