Merge "Running update-makefiles for fixed spacing." am: 8766c010ba
am: 40157b7d9f

Change-Id: I8b7d0259980fb231b9481c7f4f178f8b5950809b