Update makefiles after merge of Chromium at 6a4d455b8650

This commit was generated by merge_from_chromium.py.

Change-Id: I557279c1fc3cc36ec2089c6598748c718775adea
10 files changed