Update makefiles after merge of Chromium at 48c3e5ebfd26

This commit was generated by merge_from_chromium.py.

Change-Id: Ic1f1fc5a80c7cff62b82a837624badba2b03e94c
20 files changed