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

Change-Id: I83dae746e1ee7d04fd10244203c42930643d185b