Merge "DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for non-A/B devices" into oc-mr1-dev