Update to clang-4639204
am: 8cd7907df0

Change-Id: I82f532ebdd02f8c5311f50031765987bccd3e485