Merge "DO NOT MERGE: Decoder: Fixes an out of bound write in bitstream buffer am: 1f0ab0b089  -s ours am: 4543cf41ad am: f086bb9a89 am: 2b63f25938  -s ours am: 580daabe65 am: 293fbba256 am: 9be100c242 am: 4aab0f9614 am: 7f8e6b9d14" into nyc-mr2-dev-plus-aosp