Add liblight & couple of prebuilts, and also clean up