Merge "Change atfwd from system to vendor in file_contexts"