Update makefiles after merge of Chromium at a99b7ad25d02

This commit was generated by merge_from_chromium.py.

Change-Id: I0bead36c8928faaddb9df8669c3fd7e3e3d2d7d9
10 files changed