Merge "libstagefright: set actual stride info for SW encoder input port" into...
Merge "libstagefright: set actual stride info for SW encoder input port" into lmp-mr1-dev automerge: 701b9647
automerge: 294c7f36
* commit '294c7f36':
libstagefright: set actual stride info for SW encoder input port