Merge "av: stop puller before releasing encoder" am: 8089e5a16a
am: a56eae67d0

Change-Id: Ide6fc360c915acfb5ca01be2d0371446c9ccf937