Update makefiles after merge of Chromium at 6a4d455b8650

This commit was generated by merge_from_chromium.py.

Change-Id: I1795bb36cd59bc740a3d55d60849561e7e5f1420
10 files changed