Merge "Replace uses of libcore.io.SizeOf with X.BYTES."