Update makefiles.
am: f99ae5a628

Change-Id: I39af0f154d493dea6cd8c73af574b968fa068677