am 39d51c57: Merge "Fix missing class warnings on old platforms. Also fix BaseObj.equals."

* commit '39d51c57f59b252145b063ecc16defcd8ac85fed':
  Fix missing class warnings on old platforms. Also fix BaseObj.equals.