Merge "mark libprotobuf-cpp-* as VNDK"