Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into lmp-mr1-dev

* changes:
  [automerger] stagefright: avoid buffer overflow in base64 decoder am: 5e96386ab7
  stagefright: avoid buffer overflow in base64 decoder