Merge "Allow zipfuse to mount with fscontext and context"