Merge "Add ota_metadata_pb2 to otatools.zip"