Merge "Replace uses of libcore.io.SizeOf with X.BYTES."
am: 131fa56b4f

Change-Id: I4679929053f97debc836da2fdef9fee8492ada48