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

Change-Id: If23ca07c28b3f6f4b3881d7a0dc29c0870160047