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

Change-Id: Ia3aa9ec9a9cb3ddb25de0ab8ad079eaeb7b8134f