Revert "aosp-merge: fix build/make path"

This reverts commit 07f76bcec747bd33ac465bc173234b5af15d44ef.

Change-Id: I7d9f50325d857ff6717d7c20b9cf2e80e4f48f4c
2 files changed