[automerger skipped] Update to clang-4639204 am: 8cd7907df0 am: 40ce87e953
am: 0faf10deb3  -s ours

Change-Id: I6b2a4325073b97f075b82c1a659f3357440ed70f