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

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

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