Merge "Update makefiles." am: 9119d4ccd1
am: 242b2288d7

Change-Id: I2fbb70483533b0f9be4c2c661c44986ea2dd6850