am 58de514b: Merge "Fix Class.getDex."

* commit '58de514b160674a483bcb912d367072c7354cc1e':
  Fix Class.getDex.