Update makefiles after merge of Chromium at 253112

This commit was generated by merge_from_chromium.py.

Change-Id: Ib1667995af0f133fd6d38b60915ede10bebe8df6
6 files changed