Merge "afm-unit: Simplify the Makefile"