Merge "Build libclang_android.so"
am: d297dca014

Change-Id: I5701bc07491c6c05df69dbaa802a87cd0c7f38c1