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

Change-Id: Ic6383879abe802dacbf667ba6b16add00f8fe7a9