Merge "Remove Android-specific change to override open() mask." into rvc-dev