Reorganized/commented proguard build configuration.

Review by @jsuereth.