Merge commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD

* commit 'e42038e5c7286a15a50dd1decfa1a579dbda8cd6':
  stagefright: avoid buffer overflow in base64 decoder

Bug: 62673128
Change-Id: I2cfd6b4f7e30c111de54d9b42e7bc94a3a5aefba