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

Change-Id: Ia7e6391dfdbe04fd9c475ac1d22e9237f9d4d671