Update to use bauner/android_external_android-clat