Merge "Base: Remove LOG_S variants."
am: aa00f5852f

Change-Id: Iac81601db10497ac7416752c25cc4cddb3434756