Merge "ART: Refactor verify_object.h"