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

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

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