Merge "Revert^2 "Fix static dependency on libprotobuf-cpp-lite-ndk"" am: 9f95dad19b

Change-Id: Id90932211b93aa73b557f7753e82260ffb97b279