Merge "Fix file_contexts for flattened apexes"