Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12' * commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12': Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.
Merge commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12' * commit '9aa05ec2cd6bc592074c7bd08d22db46649c7f12': Reverse the default setting of media.stagefright.enable-{rtsp,record} in preparation for building without opencore.