Merge "Fix incorrect proguard keepfile generation for fields." into lmp-ub-dev