Merge "Use liblog for liblog (instead of libcutils)"