Merge "Remove two unused libraries" am: 2458e4ad5d am: 97bf4d0551 am: a914538105

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide06e37c4bec2eac5b65b277307ffcfb96cfedf7