Merge "Revert "Exec_start derive_classpath on post-fs-data.""