Merge "Replace cutils/log.h with either android/log.h or log/log.h"