Update makefiles from anywhere. am: 831692a989 am: 8ea0e9f1ad am: 5413042f5f
am: fbb09da447

Change-Id: I628667754dcc07933e4e46135228b8f98ead81ec