Merge "Change truth package to one that will be placed on the classpath"