Update makefiles to match extract-files.sh

Change-Id: I357b3476a6794ceef6f05c0f3b99ffd8ad5c042c