Merge "stagefright: use frame height if slice height is 0" into lmp-dev