Merge "Replace $(COMMON_JAVA_PACKAGE_SUFFIX) with .jar"