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

Change-Id: I8e3a43273b89ae97ccba0715d99e9dc5286821ef