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

Change-Id: I3db09a25e9b81e24b67ed6f3c3a29547feba3853