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

Change-Id: Ie8542e03cd07103643818df2bdba580641b1a911