Updating all makefiles. am: dfd8287506
am: f5da927e19  -s ours

Change-Id: Icd83f7890b799bc3a749c831240fcf12ca243433