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

Change-Id: I1604a92a70f05ff9a11e18d661c93a86bf6860af