Merge "Remove libclang.so" am: 5f0db32950
am: 9576143b5c

Change-Id: I31c465a9dfdff252ef35eb718791e3b6eac4926e