Move declaration of device::Info::targetId_ to be adjacent to the other char* name fields. Change-Id: Iefb249e801765a87b243a2a5e6997e78e817be2b