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

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

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