Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc' * commit 'a5fe77d004091bd9521d087c2572f587191afbfc': Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder
Merge commit 'a5fe77d004091bd9521d087c2572f587191afbfc' * commit 'a5fe77d004091bd9521d087c2572f587191afbfc': Workaround for a QCOM issue where the output buffer size advertised by the AVC encoder