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

Change-Id: I6841606c910b71000752c35d88cb51f4d89a3bd0