Merge "Label APEX files correctly when TARGET_FLATTEN_APEX=true"