Update makefiles after merge of Chromium at 252692

This commit was generated by merge_from_chromium.py.

Change-Id: I9159257b9bddb947b3d5462c32f17b3b2ece5683
6 files changed