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

Change-Id: I2bfb7c6ed65b77ed772fc9567734fd6737d872e7