Yet more changes to prebuilt

Change-Id: I31f5246fb6af455252c2057d5e3940a1f0d7b5af