Merge "stagefright: distinguish HAL name from name in MediaCodecInfo" into main