Merge "Revert^2 "Add <uses-library> information."" am: d3b1a755e6 am: db663dcc91 am: 66f15b81b3

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1522978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied5920ce16bb8bc02c666d2d2d7712e9231f138a