[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe5496 am: 3c2b8586ad

Change-Id: Ic6f76fbc3f7c128d8a6bad06bdf596e37701090f