Merge "Remove libclang.so"
am: 5f0db32950

Change-Id: Iff4882878db2b64d8e33d985195c3e799309ecc7