Merge "Remove unnecessary giflib dependency." into main am: c4bbed0eee

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3269892

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