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 am: 998e71e187 am: 14a05e250c am: 18b498dc4c
am: b0b2bbaf87

Change-Id: I8fb744a8673be4bca158ac7bdd1b0a8573e32fc4