Merge "Rename APEX file_contexts as <name>-file_context"