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

Change-Id: Ica0e8803fe8f78cd2298e6323c88e496ceba2944