Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
am: cddbfe5496

Change-Id: Ic03f8dbd9b54cd9a4899b10cb554e294155dcc6d