This reverts commit d9672859. Reason for revert: broke builds where makefiles were using M4 without depending upon it Change-Id: I13312a77e8178e7a6ad7dec09a0efe33cff882f3