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

Change-Id: I8d9d6b52391acf703b2f18f0385648e3ef10d948