Update to clang-4639204 am: 8cd7907df0
am: 40ce87e953

Change-Id: I1d787501ab532e27c88fb77fbaa68025091a742a