poplar: Fix proper CPU and ARM Variant type am: b38b6c9ea6

Original change: https://android-review.googlesource.com/c/device/linaro/poplar/+/2298370

Change-Id: I22b2fd3220c9922dd02281c9a96f917645859caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>