Merge "IMediaSource: Pack alignment of ReadOption struct" am: 7449b5e025
am: 0ff8666bee

Change-Id: Iaafa2bed6399cc00b233b78d5d05d69d39ad2b0f