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

Change-Id: Ia50926f618e0c9045196fbf8413901c28ccd1f73