Merge "Explicitly include log/log.h or android/log.h instead of cutils/log.h" am: b5db125860
am: 4a1f714ed0

Change-Id: Iced17f8c405d793a5107b1b35d8d484538b63766