Merge "stagefright: fix finding hardware codec"