[automerger skipped] Merge "av: stop puller before releasing encoder" am: 8089e5a16a am: a56eae67d0
am: 302da639cb -s ours
am skip reason: change_id I78ecb2207ae595784204bd6392311dc194af306d with SHA1 aa50b1c123 is in history

Change-Id: Ied534e60c9860ca61e46b50aefb202742dbe50ac