Merge "manifest.xml: fix IMapper incompatible build error" am: 60bfcf4da4 am: 82dccdad05

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/2244773

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