Update makefiles after merge of Chromium at 222376

This commit was generated by merge_from_chromium.py.

Change-Id: Ieeb8c5973a0cca82e87f8f58eb69a2acf9456dd9
6 files changed