Merge changes I918b4878,I85238d93,Iefee8a91

am: a48f8c8070

Change-Id: Icaea636b21c37c1017d11f104b100805c77459ab

java/java.go

@@ -370,6 +370,8 @@ func (j *Module) OutputFiles(tag string) (android.Paths, error) {
 		return append(android.Paths{j.outputFile}, j.extraOutputFiles...), nil
 	case ".jar":
 		return android.Paths{j.implementationAndResourcesJar}, nil
+	case ".proguard_map":
+		return android.Paths{j.proguardDictionary}, nil
 	default:
 		return nil, fmt.Errorf("unsupported module reference tag %q", tag)
 	}