Use android-base/macro.h instead of base/macro.h am: 247c9fec48 am: 5c39b57137

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/3303696

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