Merge "Remove BOARD_OVERRIDE_RS_CPU_VARIANT_*"