Merge "Remove BOARD_OVERRIDE_RS_CPU_VARIANT_*" am: ece9b9d666
am: b48b174951

Change-Id: I79fa6f0013fb5ca6454b955d6a1406ef0c1991cd