Merge "Define proguard dictionary output for R8"
am: 2f05802a78

Change-Id: I32f3fb1f8d64c61c6484d3dd28f82bd099721599