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

Change-Id: I18410601cfbb5d96340fd473a080e8f88d90f058