Change-Id: Id8ad5983bc7886cb24763a8fe8a7460a8609f927
This should make updates-makefiles.sh usable. Change-Id: I118fcb1bcbed290eb894f92c058269189f2dde84