Merge "Fix bugs in *_file_contexts targets"