Merge "stagefright: fix finding hardware codec" am: 9e43a10577
am: cb31148c4f

Change-Id: Id09d8c44d1a02e0cc17d0bd75f3771cfadf43d34