Merge "Revert^2 "Fix static dependency on libprotobuf-cpp-lite-ndk""