Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f am: 4d76a4b5
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f am: 8f6c537f
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a am: 5045de6f
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386a
  stagefright: avoid buffer overflow in base64 decoder