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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id61f9d67f948dfde4d5398e756f6394a4d358270