am 8c934ac6: Remove workaround now unneeded with Proguard 5.1

* commit '8c934ac65c7c361040d9c181fdb4bd258644fd53':
  Remove workaround now unneeded with Proguard 5.1