Merge "Update makefiles iff there is a change" am: 40a23233ec am: bbec6ab25c
am: f92b06cbdc

Change-Id: I0306beb657e4ae5fac683af87d9f51774ec1f457