[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3  -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0 am: 94b2e04aae am: 35a1e90c82 am: dc3b1f6afb am: 6fc85a6704 am: d3929710ee am: e4e741c79c

Change-Id: Ib61e6205a19fd587ed006245d490b1a83b95adcf