Merge "[automerger] Merge "stagefright: avoid buffer overflow in base64...

Merge "[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am: cddbfe54 am: 3c2b8586 am: 5dc58ac3 am: c42e7826 am: 5c9fc688 am: bc0b041f am: 21c75b8f am: 93b2a3f4 am: 88fd67f2 am: fb1443d4 am: 321c8cf5 am: ce3ea21a am: 0b6bcc9e am: b893a0f6 am: 07c26188" into oc-mr1-dev-plus-aosp
am: 163026d7

Change-Id: I54d47cc15b12953a9d9bc5db3a9cebdca2688c0d