Merge "Fix static dependency on libprotobuf-cpp-lite-ndk"