Merge "Keep the collected Proguard configuration"
am: 0c2a796853

Change-Id: Icbaef8854a012366cb8cbe9d647065bd85962665