Merge "Fix "ndk-build clean" to not delete prebuilt static libraries"