Update makefiles after merge of Chromium at 9ef958e74e13

This commit was generated by merge_from_chromium.py.

Change-Id: I8d97bddd35e54b452d282c77cccccf47e50b4b6d
10 files changed