Merge "Rename r8 to r8-compat-proguard" am: 81eeb78200
am: 4eee474504

Change-Id: I8c345ba17bf7614e64dc31456cb00f51bb248615