Merge "Drop prebuilt files to android source tree." am: 89e6a19857 am: 8a09fc3fee

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

Change-Id: I153e784409e7a2355ad9eafe102ff52dad04fae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>