Merge "Remove obsolete TARGET_SIMULATOR checks"