Merge "Use file_contexts files for flattened APEXes"