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

Merge "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: ea7f7702" into oc-dr1-dev-plus-aosp am: a0d86e80" into oc-mr1-dev-plus-aosp
am: a58155bd

Change-Id: If5e0adf8ea5dc06b77fc04d7ea5ad1f280d0659d