Merge "libcore: reference log/log.h when using LOG* macros" am: 96bc40d441
am: 16a54a1d03

Change-Id: I1f1935ab337dfe19e47517bc2b013355a6abcd77