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

Change-Id: I1611c22931bec8eb6992b7ffde3d59ef7419c7c6