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

Change-Id: Ib6b97636483bea8d025040b0f8c522efe09c2aaf