Merge "Remove BOARD_OVERRIDE_RS_CPU_VARIANT_*"
am: ece9b9d666

Change-Id: I57295d1b51b16989ba0e4a000b91a6d33cc022c3