Merge "Don't use bare `noreturn` in log.h." am: fe05f1cde4
am: 3f789b70ea

Change-Id: I5f5d65daaf5d6b9e006463960da50a33e9f8bfd3