Merge "Revert "Add <uses-library> information."" am: f1f46cf1df am: 1c8e6b0417 am: 64b47d87bf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1e068fc252d16c72ee368ccfcc8369431c2dfb5