Update makefiles after merge of Chromium at 256368

This commit was generated by merge_from_chromium.py.

Change-Id: Ice9e5aaf1a5a4251019b555b3d2f8d8c53f3187c
2 files changed