aosp-merge: fix build/make path

also squash build make as usually there is nothing usefull, but release version changes

Change-Id: I8a79e87d2b2d79138b4478c2e07ed9410d5d1b85
diff --git a/utils/aosp-forked-list b/utils/aosp-forked-list
index f90b355..3fc149d 100644
--- a/utils/aosp-forked-list
+++ b/utils/aosp-forked-list
@@ -1,5 +1,5 @@
 bionic
-build
+build/make
 build/soong
 development
 external/e2fsprogs