aosp-merge: fix build/make path

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

Change-Id: I8a79e87d2b2d79138b4478c2e07ed9410d5d1b85
2 files changed