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

Change-Id: Iaca67384c7656fbad06256def74ac5b304f2f8b4