Merge "Prevent using config.mk from make, clean up unused code"