Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2 am: c9f3141735 am: 80e619c871

Original change: https://android-review.googlesource.com/c/platform/development/+/2044647

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