Merge "Remove two unused libraries" am: 2458e4ad5d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4f69a012e2f0f26264382f39fd6d2ef86d50a8d