Merge "Use liblog_for_runtime_apex instead of liblog"