[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3  -s ours am: c1e3b0cda0

Change-Id: I203f15b2b318b43ef01ab2e741a2cec7a5a55e5c