Merge "Modify the classpath due to the location changing of Gallery."