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

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

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