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

Change-Id: Ie6d85e2fd0afeaa8d262493f9e18124297eb39f5