Merge "Ensure that ClassTable has correct alignment in image." am: d16bb3f0dc
am: a93138b7d6

* commit 'a93138b7d679cc21331f098af43de6f1f4fecf5e':
  Ensure that ClassTable has correct alignment in image.