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

Change-Id: I171dd234ded3baba5f4bb16dcb13c4a3be7462ae