Merge "libcore: reference log/log.h when using LOG* macros"