Update makefiles after merge of Chromium at 279716

This commit was generated by merge_from_chromium.py.

Change-Id: I7dbbf5bd88422650cd0ab7ab0cf5574130b3a1bf
10 files changed