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

Change-Id: I9c12ed462aa3d65b1a57ba781c621e258592f09b