Merge "Fix update-makefile-helpers."
am: 2f89987494

Change-Id: I20a389d80a051084a4882e6987a689688272be79