Changes to prebuilts

Change-Id: Iffd4cd4613b99b369ec64eb011f1e078e351be0f