Prebuilts done right!

Change-Id: Ib6c1ddabeaef174432606e51d59426bea438f45a