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

Change-Id: I8dfbdef411cf778d658b83495d3570c1c32e607b