Merge "make libprotobuf-cpp-* libs VNDK"