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

Change-Id: I77cc629a05e6413830448d41e7a472409d8c8bdb