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

Change-Id: Ie11e90cbbb8450c6a281cb40e45d9b1db5771d3e