Merge "Fix static dependency on libprotobuf-cpp-lite-ndk" am: 71acbf9920

Change-Id: Ib2676243eaadbf695a3bedfe53b4265620b77802