Merge "Revert "Move libclang prebuilt to Android.bp""