Merge "Aesthetic changes in art::mirror::Object and art::mirror::Class." am: ed7f95d6 am: 1df03162 am: da0080da Change-Id: I548b61855162a17dbe36ca96df2131802f37a8ef