Merge "Config: Remove system props from target makefile."