Merge \\\\\\\"Fix corruption via buffer overflow in mediaserver\\\\\\\" into klp-dev am: b5299033ce am: 357e0f132e am: efa1272404 am: e20f434b16 am: 63b7b724b0 am: fbdd8670a0
am: b528c30f00

Change-Id: I45609cc7db5ce15b9e3ce02465d5a81e849f445d