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

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

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