Merge "Replace $(COMMON_JAVA_PACKAGE_SUFFIX) with .jar"
am: 7015dfdf76

Change-Id: If076f46a60d3e7311ca9ed3e44b4a41f6844b06c