Merge "Added support for using R8 instead of Proguard + dx"