Update makefiles after merge of Chromium at 227040

This commit was generated by merge_from_chromium.py.

Change-Id: I2098783647e77aa1430f0e0129c6b8bc9482fff3
12 files changed