Merge "Removing local image lookup from load_buf" am: 77ac76c094 am: 0a2c44f5d3 am: 7e7f072d20

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2633938

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