rework prebuilts

Change-Id: I897081101ed99314046414d2593792af95d7cc95