Merge "Replace cutils/log.h with either android/log.h or log/log.h" am: a05da2eea4
am: 9e97dc7832

Change-Id: I414954c96ad8b803a0401d416887c9ce167db210