[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into...

[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8  -s ours am: c1e3b0cd am: f6ae88fd am: 398d2167 am: 94b2e04a am: 35a1e90c am: dc3b1f6a am: 6fc85a67 am: d3929710 am: e4e741c7 am: 91144 am: 0868c86c

Change-Id: I0d3d98b5431db0a3bda7e1f3e9bdd41ef655227b