Fix: Cleanse the top nibble for 31-bit pointers only when running s390 build on 31-bit s390 host architecture
Fix presubmit: trailing whitespace in comments