Merge "Rename <cutils/log.h> to <log/log.h>"