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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c56995272608cecb4a9a948e3c219d091ea7651