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

Change-Id: Iada6d9608034b9027c1778d35e30730e5afce703