Merge "Fix missing class warnings on old platforms. Also fix BaseObj.equals."