Merge "Added support for using R8 instead of Proguard + dx" am: 9047dce212 am: 6836c47b8b
am: 8347c5baef

Change-Id: I019246d7ac1e7ed03b7a87934beb72906bf1c6aa