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

Change-Id: Ia1827cdeed0408185a507be711cf817011a2f121