Readd GENDER to english logentry messages

Was removed due to performance reason, but some fixed are applied in
meantime, so there should not be a problem on adding the GENDER back.

This is a (manually) partial revert of r110909

bug: 24156
Change-Id: I8139c51bb8a1ea4fa69a1327c46d347ea043cc9f
Merge "Readd GENDER to english logentry messages"