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

Change-Id: Iec37d54ccc7252f8d408695294cc4c93cdb7fd75