am 9ce2b6d3: am b389a944: Merge "Fix Class.getDeclaringClass bug"

* commit '9ce2b6d384f9316260caa2cf44d6caa4e373a601':
  Fix Class.getDeclaringClass bug