Fix compilation error.
Update proguard mapping, bump version 1.6.1.