Merge "Make mclinker depend on libLLVM_android.so"