Merge "Revert "Fix static dependency on libprotobuf-cpp-lite-ndk"" am: 32c3f23f37

Change-Id: I5bee0e942b60081edfb82e24f7cfc61a2fd16f1b