Merge "Remove obsolete VERSION_SPLIT_ANR"