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

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

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