Merge "Skip flattened apexes while check_target_files_vintf"