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

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

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