Update makefiles.
am: ecbec2b749  -s ours

Change-Id: I2ac0fbd50972281300d9e0618e25d4df5d8310a8