Merge "SampleIterator: fix sizeof bug in getSampleSizeDirect."
am: d31b6e37f0

Change-Id: I633c0fcd3cfda2100c20e4e076fbf4ec338551b0