Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev