Merge "Fix potential makefile bug."