golden&prebuilts: makefile clean-up and merge of cspsa stuff