Merge "Revert "Fix static dependency on libprotobuf-cpp-lite-ndk"" am: 32c3f23f am: d7c84979 am: 52a0f7c4 Change-Id: I2a65161fec95fa66760d8f5675003bffcce9a6aa