Merge "Build libclang_android.so" am: d297dca014 am: 9a816162b3 am: 745c89b974 am: c81e954f78
am: df88d62268

Change-Id: I27458d6907c0638926bd0c25cbb695c8e1577a8b