Merge "Move mirror::Object setters to ObjPtr" am: 0d7398fd54 am: 153b83e8da
am: 1c83b0886e

Change-Id: Ic058da37193c9c232200d7e9569b7467a1baba6b