Merge "Fix the incorrect prebuilts-info in aosp-master-boot"