Merge "Aesthetic changes in art::mirror::Object and art::mirror::Class."
am: ed7f95d6e9

Change-Id: I26bd9a4344029ef7c67d8b4caa2fe5f256ae02ea