Merge "liblog: replace android/log.h to log/log.h"