Merge "Allow odsign to rename apex_art_data_file:dir"