Merge "liblog: Harden log_id check." am: c280143d9b
am: cafb1b7776

Change-Id: I49af30395f3904a9e987b01150417ea449d4da3e