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

Change-Id: Id3df3cbbc68dc2ec539609bf7e5dac24e4fea8e1