Merge "Make libbcc depend on libLLVM_android.so"