Merge "Fix name for NDK protobuf libraries."