am b389a944: Merge "Fix Class.getDeclaringClass bug"

* commit 'b389a9449b7f31f21b5fbdc0ad101f720c028de6':
  Fix Class.getDeclaringClass bug